Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-13811] fixes wrong stylings on several modals #2280

Merged
merged 3 commits into from
Jan 30, 2019
Merged

[MM-13811] fixes wrong stylings on several modals #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0006ba4
fix wrong styling on several modals
svelle Jan 24, 2019
44c3e52
update test snapshots
svelle Jan 24, 2019
49398aa
Merge branch 'master' of github.com:mattermost/mattermost-webapp into…
svelle Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/__snapshots__/get_link_modal.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ exports[`components/GetLinkModal should have called onHide 1`] = `
componentClass="div"
>
<button
className="btn btn-default"
className="btn btn-link"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
Expand Down Expand Up @@ -146,7 +146,7 @@ exports[`components/GetLinkModal should have called onHide 2`] = `
componentClass="div"
>
<button
className="btn btn-default"
className="btn btn-link"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
Expand Down Expand Up @@ -233,7 +233,7 @@ exports[`components/GetLinkModal should match snapshot when all props is set 1`]
componentClass="div"
>
<button
className="btn btn-default"
className="btn btn-link"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
Expand Down Expand Up @@ -315,7 +315,7 @@ exports[`components/GetLinkModal should match snapshot when helpText is not set
componentClass="div"
>
<button
className="btn btn-default"
className="btn btn-link"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
Expand Down
2 changes: 1 addition & 1 deletion components/get_link_modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default class GetLinkModal extends React.PureComponent {
<button
id='linkModalCloseButton'
type='button'
className='btn btn-default'
className='btn btn-link'
onClick={this.onHide}
>
<FormattedMessage
Expand Down
2 changes: 1 addition & 1 deletion components/invite_member_modal/invite_member_modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ class InviteMemberModal extends React.PureComponent {
{serverError}
<button
type='button'
className='btn btn-default'
className='btn btn-link'
onClick={this.addInviteFields}
>
<FormattedMessage
Expand Down
4 changes: 2 additions & 2 deletions components/multiselect/__snapshots__/multiselect.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ exports[`components/multiselect/multiselect should match snapshot 1`] = `
className="filter-controls"
>
<button
className="btn btn-default filter-control filter-control__next"
className="btn btn-link filter-control filter-control__next"
onClick={[Function]}
>
<FormattedMessage
Expand Down Expand Up @@ -299,7 +299,7 @@ exports[`components/multiselect/multiselect should match snapshot for page 2 1`]
className="filter-controls"
>
<button
className="btn btn-default filter-control filter-control__prev"
className="btn btn-link filter-control filter-control__prev"
onClick={[Function]}
>
<FormattedMessage
Expand Down
4 changes: 2 additions & 2 deletions components/multiselect/multiselect.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export default class MultiSelect extends React.Component {
if (options.length > pageEnd) {
nextButton = (
<button
className='btn btn-default filter-control filter-control__next'
className='btn btn-link filter-control filter-control__next'
onClick={this.nextPage}
>
<FormattedMessage
Expand All @@ -264,7 +264,7 @@ export default class MultiSelect extends React.Component {
if (this.state.page > 0) {
previousButton = (
<button
className='btn btn-default filter-control filter-control__prev'
className='btn btn-link filter-control filter-control__prev'
onClick={this.prevPage}
>
<FormattedMessage
Expand Down