IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Button styling update for consistent buttons (#24483)

Browse Source 
* Updating button changes

* Updating button

* Updating invite modal button

* Updating button changes

* Updating button

* Updating buttons

* Updating buttons

* Updating buttons

* Updating back btn

* Updating various buttons

* Updating tests

* Updating test

* Reverting channel icon

* Update channel_profile.tsx

* Update setting_picture.tsx

* Updating tests

* Update group_member_list.test.tsx.snap

* Update user_group_popover.test.tsx.snap

* Update user_group_popover.test.tsx.snap

* Updating tests and adding btn class

* Adding btn-xs class

* Updating tests

* Updating test

* Updating test file

* Updating test

* Updating changes requested by daniel

* Updating test

* Updating based on harrisons feedback

* Updating buttons

* Updating test

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Asaad Mahmood 2023-09-25 15:17:14 +05:00 committed by GitHub
parent 6c48cca78f
commit 6f4382189f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
183 changed files with 722 additions and 1102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/channels/src/components/__snapshots__/get_link_modal.test.tsx.snap
View File

@ -60,7 +60,7 @@ exports[`components/GetLinkModal should have called onHide 1`] = `
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
@ -155,7 +155,7 @@ exports[`components/GetLinkModal should have called onHide 2`] = `
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
@ -246,7 +246,7 @@ exports[`components/GetLinkModal should match snapshot when all props is set 1`]
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="linkModalCloseButton"
onClick={[Function]}
type="button"
@ -332,7 +332,7 @@ exports[`components/GetLinkModal should match snapshot when helpText is not set
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="linkModalCloseButton"
onClick={[Function]}
type="button"

10
webapp/channels/src/components/__snapshots__/save_button.test.tsx.snap
View File

@ -2,7 +2,7 @@
exports[`components/SaveButton should match snapshot, extraClasses 1`] = `
<button
className="save-button btn btn-primary some-class"
className="btn btn-primary some-class"
data-testid="saveSetting"
disabled={false}
id="saveSetting"
@ -29,7 +29,7 @@ exports[`components/SaveButton should match snapshot, extraClasses 1`] = `
exports[`components/SaveButton should match snapshot, on defaultMessage 1`] = `
<button
className="save-button btn btn-primary"
className="btn btn-primary "
data-testid="saveSetting"
disabled={false}
id="saveSetting"
@ -56,7 +56,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 1`] = `
exports[`components/SaveButton should match snapshot, on defaultMessage 2`] = `
<button
className="save-button btn btn-primary"
className="btn btn-primary "
data-testid="saveSetting"
disabled={false}
id="saveSetting"
@ -80,7 +80,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 2`] = `
exports[`components/SaveButton should match snapshot, on savingMessage 1`] = `
<button
className="save-button btn btn-primary"
className="btn btn-primary "
data-testid="saveSetting"
disabled={true}
id="saveSetting"
@ -107,7 +107,7 @@ exports[`components/SaveButton should match snapshot, on savingMessage 1`] = `
exports[`components/SaveButton should match snapshot, on savingMessage 2`] = `
<button
className="save-button btn btn-primary"
className="btn btn-primary "
data-testid="saveSetting"
disabled={true}
id="saveSetting"

18
webapp/channels/src/components/__snapshots__/setting_item_max.test.jsx.snap
View File

@ -27,7 +27,7 @@ exports[`components/SettingItemMax should match snapshot 1`] = `
>
<hr />
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -46,7 +46,7 @@ exports[`components/SettingItemMax should match snapshot 1`] = `
}
/>
<button
className="btn btn-sm btn-cancel cursor--pointer style--none"
className="btn btn-tertiary"
id="cancelSetting"
onClick={[Function]}
>
@ -98,7 +98,7 @@ exports[`components/SettingItemMax should match snapshot, on clientError 1`] = `
</label>
</div>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -117,7 +117,7 @@ exports[`components/SettingItemMax should match snapshot, on clientError 1`] = `
}
/>
<button
className="btn btn-sm btn-cancel cursor--pointer style--none"
className="btn btn-tertiary"
id="cancelSetting"
onClick={[Function]}
>
@ -169,7 +169,7 @@ exports[`components/SettingItemMax should match snapshot, on serverError 1`] = `
</label>
</div>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -188,7 +188,7 @@ exports[`components/SettingItemMax should match snapshot, on serverError 1`] = `
}
/>
<button
className="btn btn-sm btn-cancel cursor--pointer style--none"
className="btn btn-tertiary"
id="cancelSetting"
onClick={[Function]}
>
@ -230,7 +230,7 @@ exports[`components/SettingItemMax should match snapshot, with new saveTextButto
>
<hr />
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage="CustomText"
disabled={false}
extraClasses=""
@ -244,7 +244,7 @@ exports[`components/SettingItemMax should match snapshot, with new saveTextButto
}
/>
<button
className="btn btn-sm btn-cancel cursor--pointer style--none"
className="btn btn-tertiary"
id="cancelSetting"
onClick={[Function]}
>
@ -286,7 +286,7 @@ exports[`components/SettingItemMax should match snapshot, without submit 1`] = `
>
<hr />
<button
className="btn btn-sm btn-cancel cursor--pointer style--none"
className="btn btn-tertiary"
id="cancelSetting"
onClick={[Function]}
>

48
webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap
View File

@ -69,7 +69,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -81,7 +81,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
</button>
<button
aria-label="Save"
className="btn btn-sm btn-primary"
className="btn btn-primary"
data-testid="saveSettingPicture"
disabled={false}
onClick={[Function]}
@ -100,7 +100,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -174,7 +174,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -186,7 +186,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
</button>
<button
aria-label="Save"
className="btn btn-sm btn-primary"
className="btn btn-primary"
data-testid="saveSettingPicture"
disabled={false}
onClick={[Function]}
@ -205,7 +205,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -289,7 +289,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={true}
onClick={[Function]}
@ -301,7 +301,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
</button>
<button
aria-label="Uploading..."
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -320,7 +320,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -416,7 +416,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -428,7 +428,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
</button>
<button
aria-label="Save"
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -447,7 +447,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -531,7 +531,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -543,7 +543,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
</button>
<button
aria-label="Save"
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -562,7 +562,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -658,7 +658,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -670,7 +670,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
</button>
<button
aria-label="Save"
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -689,7 +689,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -827,7 +827,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -839,7 +839,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
</button>
<button
aria-label="Save"
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -858,7 +858,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>
@ -996,7 +996,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
/>
<button
aria-label="Select"
className="btn btn-sm btn-primary btn-file sel-btn"
className="btn btn-primary btn-file"
data-testid="inputSettingPictureButton"
disabled={false}
onClick={[Function]}
@ -1008,7 +1008,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
</button>
<button
aria-label="Save"
className="btn btn-sm btn-inactive disabled"
className="btn btn-inactive disabled"
data-testid="saveSettingPicture"
disabled={true}
onClick={[Function]}
@ -1027,7 +1027,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
</span>
<button
aria-label="Cancel"
className="btn btn-link btn-sm theme"
className="btn btn-tertiary theme ml-2"
data-testid="cancelSettingPicture"
onClick={[Function]}
>

4
webapp/channels/src/components/access_history_modal/__snapshots__/access_history_modal.test.tsx.snap
View File

@ -68,7 +68,7 @@ exports[`components/AccessHistoryModal should match snapshot when audits exist 1
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="closeModalButton"
type="button"
>
@ -140,7 +140,7 @@ exports[`components/AccessHistoryModal should match snapshot when no audits exis
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="closeModalButton"
type="button"
>

2
webapp/channels/src/components/access_history_modal/access_history_modal.tsx
View File

@ -78,7 +78,7 @@ const AccessHistoryModal = ({
<button
id='closeModalButton'
type='button'
className='btn btn-link'
className='btn btn-tertiary'
>
<FormattedMessage
id='general_button.close'

4
webapp/channels/src/components/activity_log_modal/__snapshots__/activity_log_modal.test.tsx.snap
View File

@ -69,7 +69,7 @@ exports[`components/ActivityLogModal should match snapshot 1`] = `
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="closeModalButton"
type="button"
>
@ -151,7 +151,7 @@ exports[`components/ActivityLogModal should match snapshot when submitRevoke is
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
id="closeModalButton"
type="button"
>

2
webapp/channels/src/components/activity_log_modal/activity_log_modal.tsx
View File

@ -142,7 +142,7 @@ export default class ActivityLogModal extends React.PureComponent<Props, State>
<button
id='closeModalButton'
type='button'
className='btn btn-link'
className='btn btn-tertiary'
>
<FormattedMessage
id='general_button.close'

2
webapp/channels/src/components/add_user_to_channel_modal/__snapshots__/add_user_to_channel_modal.test.tsx.snap
View File

@ -104,7 +104,7 @@ exports[`components/AddUserToChannelModal should match snapshot 1`] = `
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/add_user_to_channel_modal/add_user_to_channel_modal.tsx
View File

@ -321,7 +321,7 @@ export default class AddUserToChannelModal extends React.PureComponent<Props, St
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.onHide}
>
<FormattedMessage

2
webapp/channels/src/components/add_users_to_group_modal/__snapshots__/add_users_to_group_modal.test.tsx.snap
View File

@ -38,7 +38,7 @@ exports[`component/add_users_to_group_modal should match snapshot 1`] = `
>
<button
aria-label="Close"
className="modal-header-back-button btn-icon"
className="modal-header-back-button btn btn-icon"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/add_users_to_group_modal/add_users_to_group_modal.tsx
View File

@ -103,7 +103,7 @@ const AddUsersToGroupModal = (props: Props) => {
<Modal.Header closeButton={true}>
<button
type='button'
className='modal-header-back-button btn-icon'
className='modal-header-back-button btn btn-icon'
aria-label='Close'
onClick={goBack}
>

4
webapp/channels/src/components/admin_console/__snapshots__/bleve_settings.test.tsx.snap
View File

@ -220,7 +220,7 @@ exports[`components/BleveSettings should match snapshot, disabled 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -479,7 +479,7 @@ exports[`components/BleveSettings should match snapshot, enabled 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

8
webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.jsx.snap
View File

@ -234,7 +234,7 @@ exports[`components/ClusterSettings should match snapshot, compression disabled
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -507,7 +507,7 @@ exports[`components/ClusterSettings should match snapshot, compression enabled 1
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -780,7 +780,7 @@ exports[`components/ClusterSettings should match snapshot, encryption disabled 1
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1053,7 +1053,7 @@ exports[`components/ClusterSettings should match snapshot, encryption enabled 1`
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap
View File

@ -385,7 +385,7 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

4
webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.jsx.snap
View File

@ -448,7 +448,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -934,7 +934,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

8
webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.jsx.snap
View File

@ -135,7 +135,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -404,7 +404,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -578,7 +578,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -847,7 +847,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

4
webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
View File

@ -153,7 +153,7 @@ exports[`components/PushSettings should match snapshot, licensed 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -288,7 +288,7 @@ exports[`components/PushSettings should match snapshot, unlicensed 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/__snapshots__/schema_admin_settings.test.jsx.snap
View File

@ -691,7 +691,7 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/audits/audits.tsx
View File

@ -65,7 +65,7 @@ export default class Audits extends React.PureComponent<Props, State> {
</h4>
<button
type='submit'
className='btn btn-link pull-right'
className='btn btn-tertiary pull-right'
onClick={this.reload}
>
<ReloadIcon/>

7
webapp/channels/src/components/admin_console/brand_image_setting/brand_image_setting.tsx
View File

@ -178,11 +178,6 @@ export default class BrandImageSetting extends React.PureComponent<Props, State>
};
render() {
let letbtnDefaultClass = 'btn';
if (!this.props.disabled) {
letbtnDefaultClass += ' btn-default';
}
let img = null;
if (this.state.brandImage) {
img = (
@ -263,7 +258,7 @@ export default class BrandImageSetting extends React.PureComponent<Props, State>
<div className='file__upload mt-5'>
<button
type='button'
className={letbtnDefaultClass}
className='btn btn-tertiary'
disabled={this.props.disabled}
>
<FormattedMessage

2
webapp/channels/src/components/admin_console/cluster_table.tsx
View File

@ -147,7 +147,7 @@ export default class ClusterTable extends PureComponent<Props> {
<div className='text-right'>
<button
type='submit'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.props.reload}
>
<ReloadIcon/>

2
webapp/channels/src/components/admin_console/compliance_reports/compliance_reports.tsx
View File

@ -439,7 +439,7 @@ export default class ComplianceReports extends React.PureComponent<Props, State>
<div className='text-right'>
<button
type='submit'
className='btn btn-link'
className='btn btn-tertiary'
disabled={this.state.runningReport}
onClick={this.reload}
>

6
webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap
View File

@ -195,7 +195,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -265,7 +265,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -506,7 +506,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

8
webapp/channels/src/components/admin_console/custom_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap
View File

@ -20,7 +20,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -79,7 +79,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -138,7 +138,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -197,7 +197,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/data_grid/data_grid.scss
View File

@ -138,7 +138,7 @@
display: flex;
height: auto;
flex-direction: row;
padding: 5px 0;
padding: 8px;
border-top: solid 1px rgba(0, 0, 0, 0.1);
border-bottom: solid 1px rgba(0, 0, 0, 0.1);
background: $white;

5
webapp/channels/src/components/admin_console/data_grid/data_grid.tsx
View File

@ -264,10 +264,9 @@ class DataGrid extends React.PureComponent<Props, State> {
total,
}}
/>
<button
type='button'
className={'btn btn-link prev ' + (firstPage ? 'disabled' : '')}
className={'btn btn-quaternary btn-icon btn-sm ml-2 prev ' + (firstPage ? 'disabled' : '')}
onClick={prevPageFn}
disabled={firstPage}
>
@ -275,7 +274,7 @@ class DataGrid extends React.PureComponent<Props, State> {
</button>
<button
type='button'
className={'btn btn-link next ' + (lastPage ? 'disabled' : '')}
className={'btn btn-quaternary btn-icon btn-sm next ' + (lastPage ? 'disabled' : '')}
onClick={nextPageFn}
disabled={lastPage}
>

4
webapp/channels/src/components/admin_console/data_retention_settings/custom_policy_form/__snapshots__/custom_policy_form.test.tsx.snap
View File

@ -229,7 +229,7 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -486,7 +486,7 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/data_retention_settings/global_policy_form/__snapshots__/global_policy_form.test.tsx.snap
View File

@ -202,7 +202,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

2
webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.scss
View File

@ -45,7 +45,7 @@
width: 160px;
height: 48px;
padding: 14px 0;
margin-right: 24px;
margin-right: 8px;
background: $primary-color;
border-radius: 4px;
color: $white;

9
webapp/channels/src/components/admin_console/file_upload_setting.jsx
View File

@ -59,11 +59,6 @@ export default class FileUploadSetting extends Setting {
serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
}
let btnClass = 'btn';
if (this.state.fileSelected) {
btnClass = 'btn btn-primary';
}
let fileName;
if (this.state.fileName) {
fileName = this.state.fileName;
@ -86,7 +81,7 @@ export default class FileUploadSetting extends Setting {
<div className='file__upload'>
<button
type='button'
className='btn btn-default'
className='btn btn-tertiary'
disabled={this.props.disabled}
>
<FormattedMessage
@ -104,7 +99,7 @@ export default class FileUploadSetting extends Setting {
</div>
<button
type='button'
className={btnClass}
className='btn btn-primary'
disabled={!this.state.fileSelected}
onClick={this.handleSubmit}
>

8
webapp/channels/src/components/admin_console/filter/filter.scss
View File

@ -78,15 +78,7 @@
}
.Filter_apply {
margin: 8px 8px 8px 0;
border-radius: 4px;
float: right;
font-size: 12px;
&:disabled {
background: rgba(var(--sys-center-channel-color-rgb), 0.1);
color: var(--sys-center-channel-color);
}
}
.FilterList {

2
webapp/channels/src/components/admin_console/filter/filter.tsx
View File

@ -232,7 +232,7 @@ class Filter extends React.PureComponent<Props, State> {
<button
type='button'
className='Filter_apply style--none btn btn-primary'
className='btn btn-primary btn-sm Filter_apply'
disabled={!this.state.optionsModified}
onClick={this.onFilter}
>

2
webapp/channels/src/components/admin_console/full_log_event_modal/full_log_event_modal.tsx
View File

@ -120,7 +120,7 @@ export default class FullLogEventModal extends React.PureComponent<Props, State>
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.props.onModalDismissed}
>
<FormattedMessage

2
webapp/channels/src/components/admin_console/generated_setting.tsx
View File

@ -92,7 +92,7 @@ export default class GeneratedSetting extends React.PureComponent<Props> {
<div className='help-text'>
<button
type='button'
className='btn btn-default'
className='btn btn-tertiary'
onClick={this.regenerate}
disabled={this.props.disabled || this.props.setByEnv}
>

12
webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
View File

@ -71,7 +71,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test private-channel_groupsyncable_remove"
onClick={[Function]}
type="button"
@ -149,7 +149,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test private-team_groupsyncable_remove"
onClick={[Function]}
type="button"
@ -234,7 +234,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test public-channel_groupsyncable_remove"
onClick={[Function]}
type="button"
@ -312,7 +312,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test public-team_groupsyncable_remove"
onClick={[Function]}
type="button"
@ -395,7 +395,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test team with children_groupsyncable_remove"
onClick={[Function]}
type="button"
@ -478,7 +478,7 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
className="text-right"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
data-testid="Test team with children_groupsyncable_remove"
onClick={[Function]}
type="button"

24
webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
View File

@ -207,7 +207,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -217,7 +217,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -437,7 +437,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -447,7 +447,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next "
className="btn btn-tertiary next "
disabled={false}
onClick={[Function]}
type="button"
@ -667,7 +667,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev "
className="btn btn-tertiary prev "
disabled={false}
onClick={[Function]}
type="button"
@ -677,7 +677,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next "
className="btn btn-tertiary next "
disabled={false}
onClick={[Function]}
type="button"
@ -857,7 +857,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev "
className="btn btn-tertiary prev "
disabled={false}
onClick={[Function]}
type="button"
@ -867,7 +867,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1087,7 +1087,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1097,7 +1097,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1359,7 +1359,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1369,7 +1369,7 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"

2
webapp/channels/src/components/admin_console/group_settings/group_details/group_teams_and_channels_row.test.tsx
View File

@ -93,7 +93,7 @@ describe('components/admin_console/group_settings/group_details/GroupTeamsAndCha
onChangeRoles={jest.fn()}
/>,
);
wrapper.find('.btn-link').simulate('click');
wrapper.find('.btn-tertiary').simulate('click');
expect(wrapper.instance().state.showConfirmationModal).toEqual(true);
wrapper.instance().removeItem();
expect(onRemoveItem).toBeCalledWith(

2
webapp/channels/src/components/admin_console/group_settings/group_details/group_teams_and_channels_row.tsx
View File

@ -237,7 +237,7 @@ State
<td className='text-right'>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={() =>
this.setState({showConfirmationModal: true})
}

4
webapp/channels/src/components/admin_console/group_settings/group_details/group_users.tsx
View File

@ -135,7 +135,7 @@ export default class GroupUsers extends React.PureComponent<Props, State> {
<button
type='button'
className={
'btn btn-link prev ' + (firstPage ? 'disabled' : '')
'btn btn-tertiary prev ' + (firstPage ? 'disabled' : '')
}
onClick={this.previousPage}
disabled={firstPage}
@ -145,7 +145,7 @@ export default class GroupUsers extends React.PureComponent<Props, State> {
<button
type='button'
className={
'btn btn-link next ' + (lastPage ? 'disabled' : '')
'btn btn-tertiary next ' + (lastPage ? 'disabled' : '')
}
onClick={this.nextPage}
disabled={lastPage}

64
webapp/channels/src/components/admin_console/group_settings/groups_list/__snapshots__/groups_list.test.tsx.snap
View File

@ -34,11 +34,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -171,11 +171,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -305,7 +305,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -315,7 +315,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -434,7 +434,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -444,7 +444,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -563,7 +563,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -573,7 +573,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -620,11 +620,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -727,7 +727,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -737,7 +737,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -784,11 +784,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -982,7 +982,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -992,7 +992,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1039,11 +1039,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -1237,7 +1237,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev "
className="btn btn-tertiary prev "
disabled={false}
onClick={[Function]}
type="button"
@ -1247,7 +1247,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1294,11 +1294,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -1401,7 +1401,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev "
className="btn btn-tertiary prev "
disabled={false}
onClick={[Function]}
type="button"
@ -1411,7 +1411,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1458,11 +1458,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -1521,11 +1521,11 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
className="group-list-link-unlink"
>
<button
className="btn btn-inactive disabled"
className="btn btn-primary"
type="button"
>
<i
className="icon fa fa-link"
className="icon icon-link-variant"
/>
<MemoizedFormattedMessage
defaultMessage="Link Selected Groups"
@ -1592,7 +1592,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -1602,7 +1602,7 @@ exports[`components/admin_console/group_settings/GroupsList.tsx should match sna
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"

8
webapp/channels/src/components/admin_console/group_settings/groups_list/groups_list.tsx
View File

@ -187,10 +187,10 @@ export default class GroupsList extends React.PureComponent<Props, State> {
return (
<button
type='button'
className='btn btn-inactive disabled'
className='btn btn-primary'
disabled={this.props.readOnly}
>
<i className='icon fa fa-link'/>
<i className='icon icon-link-variant'/>
<FormattedMessage
id='admin.group_settings.groups_list.link_selected'
defaultMessage='Link Selected Groups'
@ -517,7 +517,7 @@ export default class GroupsList extends React.PureComponent<Props, State> {
</div>
<button
type='button'
className={'btn btn-link prev ' + (firstPage ? 'disabled' : '')}
className={'btn btn-tertiary prev ' + (firstPage ? 'disabled' : '')}
onClick={(e: any) => this.previousPage(e)}
disabled={firstPage}
>
@ -525,7 +525,7 @@ export default class GroupsList extends React.PureComponent<Props, State> {
</button>
<button
type='button'
className={'btn btn-link next ' + (lastPage ? 'disabled' : '')}
className={'btn btn-tertiary next ' + (lastPage ? 'disabled' : '')}
onClick={(e: any) => this.nextPage(e)}
disabled={lastPage}
>

2
webapp/channels/src/components/admin_console/jobs/table.test.tsx
View File

@ -115,7 +115,7 @@ describe('components/admin_console/jobs/table', () => {
<JobTable {...baseProps}/>,
);
wrapper.find('.job-table__create-button > div > .btn-default').simulate('click', {preventDefault: jest.fn()});
wrapper.find('.job-table__create-button > div > .btn-tertiary').simulate('click', {preventDefault: jest.fn()});
expect(createJob).toHaveBeenCalledTimes(1);
});

2
webapp/channels/src/components/admin_console/jobs/table.tsx
View File

@ -119,7 +119,7 @@ class JobTable extends React.PureComponent<Props> {
<div>
<button
type='button'
className='btn btn-default'
className='btn btn-tertiary'
onClick={this.handleCreateJob}
disabled={this.props.disabled}
>

2
webapp/channels/src/components/admin_console/manage_roles_modal/manage_roles_modal.tsx
View File

@ -367,7 +367,7 @@ export default class ManageRolesModal extends React.PureComponent<Props, State>
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.props.onModalDismissed}
>
<FormattedMessage

4
webapp/channels/src/components/admin_console/permission_schemes_settings/edit_post_time_limit_modal/edit_post_time_limit_modal.tsx
View File

@ -159,7 +159,7 @@ export default function EditPostTimeLimitModal(props: Props) {
</div>
<button
type='button'
className='btn btn-cancel'
className='btn btn-tertiary'
onClick={props.onClose}
>
<FormattedMessage
@ -170,7 +170,7 @@ export default function EditPostTimeLimitModal(props: Props) {
<button
id='linkModalCloseButton'
type='button'
className='btn btn-default'
className='btn btn-tertiary'
onClick={save}
disabled={saving}
>

24
webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
View File

@ -384,7 +384,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -398,7 +398,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
savingMessage="Saving Config..."
/>
<Connect(BlockableLink)
className="cancel-button"
className="btn btn-tertiary"
to="/admin_console/user_management/permissions"
>
<MemoizedFormattedMessage
@ -407,7 +407,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
/>
</Connect(BlockableLink)>
<a
className="cancel-button reset-defaults-btn"
className="btn btn-quaternary"
data-testid="resetPermissionsToDefault"
onClick={[Function]}
>
@ -695,7 +695,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -709,7 +709,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
savingMessage="Saving Config..."
/>
<Connect(BlockableLink)
className="cancel-button"
className="btn btn-tertiary"
to="/admin_console/user_management/permissions"
>
<MemoizedFormattedMessage
@ -718,7 +718,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
/>
</Connect(BlockableLink)>
<a
className="cancel-button reset-defaults-btn"
className="btn btn-quaternary"
data-testid="resetPermissionsToDefault"
onClick={[Function]}
>
@ -1006,7 +1006,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1020,7 +1020,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
savingMessage="Saving Config..."
/>
<Connect(BlockableLink)
className="cancel-button"
className="btn btn-tertiary"
to="/admin_console/user_management/permissions"
>
<MemoizedFormattedMessage
@ -1029,7 +1029,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
/>
</Connect(BlockableLink)>
<a
className="cancel-button reset-defaults-btn"
className="btn btn-quaternary"
data-testid="resetPermissionsToDefault"
onClick={[Function]}
>
@ -1317,7 +1317,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1331,7 +1331,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
savingMessage="Saving Config..."
/>
<Connect(BlockableLink)
className="cancel-button"
className="btn btn-tertiary"
to="/admin_console/user_management/permissions"
>
<MemoizedFormattedMessage
@ -1340,7 +1340,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
/>
</Connect(BlockableLink)>
<a
className="cancel-button reset-defaults-btn"
className="btn btn-quaternary"
data-testid="resetPermissionsToDefault"
onClick={[Function]}
>

2
webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.test.tsx
View File

@ -233,7 +233,7 @@ describe('components/admin_console/permission_schemes_settings/permission_system
<PermissionSystemSchemeSettings {...defaultProps}/>,
);
expect(wrapper.state().showResetDefaultModal).toBe(false);
wrapper.find('.reset-defaults-btn').first().simulate('click');
wrapper.find('.btn-quaternary').first().simulate('click');
expect(wrapper.state().showResetDefaultModal).toBe(true);
});

4
webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings.tsx
View File

@ -516,7 +516,7 @@ export default class PermissionSystemSchemeSettings extends React.PureComponent<
savingMessage={localizeMessage('admin.saving', 'Saving Config...')}
/>
<BlockableLink
className='cancel-button'
className='btn btn-tertiary'
to='/admin_console/user_management/permissions'
>
<FormattedMessage
@ -527,7 +527,7 @@ export default class PermissionSystemSchemeSettings extends React.PureComponent<
<a
data-testid='resetPermissionsToDefault'
onClick={() => this.setState({showResetDefaultModal: true})}
className='cancel-button reset-defaults-btn'
className='btn btn-quaternary'
>
<FormattedMessage
id='admin.permissions.systemScheme.resetDefaultsButton'

8
webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap
View File

@ -280,7 +280,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -633,7 +633,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -988,7 +988,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1409,7 +1409,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

84
webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
View File

@ -146,7 +146,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -161,7 +161,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -309,7 +309,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -494,7 +494,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -509,7 +509,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -657,7 +657,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -753,7 +753,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Plugins
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -938,7 +938,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -953,7 +953,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -1101,7 +1101,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1286,7 +1286,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
disabled={true}
type="button"
>
@ -1303,7 +1303,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -1451,7 +1451,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1636,7 +1636,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -1651,7 +1651,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -1803,7 +1803,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1988,7 +1988,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -2003,7 +2003,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -2151,7 +2151,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -2336,7 +2336,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
disabled={true}
type="button"
>
@ -2353,7 +2353,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -2476,7 +2476,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -2661,7 +2661,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -2676,7 +2676,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -2824,7 +2824,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -3026,7 +3026,7 @@ exports[`components/PluginManagement should match snapshot, upload disabled 1`]
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -3179,7 +3179,7 @@ exports[`components/PluginManagement should match snapshot, upload disabled 1`]
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -3364,7 +3364,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -3379,7 +3379,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -3590,7 +3590,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -3775,7 +3775,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -3790,7 +3790,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -3969,7 +3969,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -4154,7 +4154,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -4169,7 +4169,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -4348,7 +4348,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -4533,7 +4533,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -4548,7 +4548,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -4727,7 +4727,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -4912,7 +4912,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="file__upload"
>
<button
className="btn btn-primary"
className="btn btn-tertiary"
type="button"
>
<MemoizedFormattedMessage
@ -4927,7 +4927,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
/>
</div>
<button
className="btn"
className="btn btn-primary"
disabled={true}
id="uploadPlugin"
onClick={[Function]}
@ -5138,7 +5138,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

4
webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
View File

@ -917,7 +917,7 @@ export default class PluginManagement extends AdminSettings<Props, State> {
lastMessage = <div className='col-sm-12'><div className='form-group half'>{this.state.lastMessage}</div></div>;
}
let btnClass = 'btn';
let btnClass = 'btn btn-primary';
if (this.state.fileSelected) {
btnClass = 'btn btn-primary';
}
@ -1157,7 +1157,7 @@ export default class PluginManagement extends AdminSettings<Props, State> {
<div className='file__upload'>
<button
type='button'
className={classNames(['btn', {'btn-primary': enableUploads}])}
className={classNames(['btn', {'btn-tertiary': enableUploads}])}
disabled={!enableUploadButton || this.props.isDisabled}
>
<FormattedMessage

10
webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap
View File

@ -9,7 +9,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
>
<div>
<button
className="btn btn-default"
className="btn btn-tertiary"
disabled={false}
onClick={[Function]}
type="button"
@ -92,7 +92,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
>
<div>
<button
className="btn btn-default"
className="btn btn-tertiary"
disabled={false}
onClick={[Function]}
type="button"
@ -229,7 +229,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
>
<div>
<button
className="btn btn-default"
className="btn btn-tertiary"
disabled={false}
onClick={[Function]}
type="button"
@ -358,7 +358,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
>
<div>
<button
className="btn btn-default"
className="btn btn-tertiary"
disabled={false}
onClick={[Function]}
type="button"
@ -488,7 +488,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
>
<div>
<button
className="btn btn-default"
className="btn btn-tertiary"
disabled={false}
onClick={[Function]}
type="button"

2
webapp/channels/src/components/admin_console/request_button/request_button.tsx
View File

@ -257,7 +257,7 @@ export default class RequestButton extends React.PureComponent<Props, State> {
<div>
<button
type='button'
className='btn btn-default'
className='btn btn-tertiary'
onClick={this.handleRequest}
disabled={this.props.disabled}
>

4
webapp/channels/src/components/admin_console/reset_email_modal/__snapshots__/reset_email_modal.test.tsx.snap
View File

@ -89,7 +89,7 @@ exports[`components/admin_console/reset_email_modal/reset_email_modal.tsx should
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>
@ -222,7 +222,7 @@ exports[`components/admin_console/reset_email_modal/reset_email_modal.tsx should
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/admin_console/reset_email_modal/reset_email_modal.tsx
View File

@ -233,7 +233,7 @@ export default class ResetEmailModal extends React.PureComponent<Props, State> {
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.doCancel}
>
<FormattedMessage

2
webapp/channels/src/components/admin_console/reset_password_modal/__snapshots__/reset_password_modal.test.tsx.snap
View File

@ -109,7 +109,7 @@ exports[`components/admin_console/reset_password_modal/reset_password_modal.tsx
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/admin_console/reset_password_modal/reset_password_modal.tsx
View File

@ -224,7 +224,7 @@ export default class ResetPasswordModal extends React.PureComponent<Props, State
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.doCancel}
>
<FormattedMessage

4
webapp/channels/src/components/admin_console/server_logs/log_list.tsx
View File

@ -209,7 +209,7 @@ export default class LogList extends React.PureComponent<Props, State> {
options: (
<button
type='submit'
className='btn btn-inverted'
className='btn btn-secondary btn-sm'
>
<FormattedMessage
id='admin.logs.fullEvent'
@ -282,7 +282,7 @@ export default class LogList extends React.PureComponent<Props, State> {
const errorsButton: JSX.Element = (
<button
className='btn btn-dangerous'
className='btn btn-tertiary btn-sm ml-2'
onClick={this.showErrors}
>
<FormattedMessage

4
webapp/channels/src/components/admin_console/server_logs/plain_log_list.tsx
View File

@ -76,7 +76,7 @@ export default class PlainLogList extends React.PureComponent<Props, State> {
nextButton = (
<button
type='button'
className='btn btn-default filter-control filter-control__next pull-right'
className='btn btn-tertiary filter-control filter-control__next pull-right'
onClick={this.nextPage}
disabled={this.state.nextDisabled}
>
@ -93,7 +93,7 @@ export default class PlainLogList extends React.PureComponent<Props, State> {
previousButton = (
<button
type='button'
className='btn btn-default filter-control filter-control__prev'
className='btn btn-tertiary filter-control filter-control__prev'
onClick={this.previousPage}
>
<LocalizedIcon

12
webapp/channels/src/components/admin_console/system_user_detail/__snapshots__/system_user_detail.test.tsx.snap
View File

@ -141,7 +141,7 @@ exports[`components/admin_console/system_user_detail should match default snapsh
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -378,7 +378,7 @@ exports[`components/admin_console/system_user_detail should match snapshot if LD
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -622,7 +622,7 @@ exports[`components/admin_console/system_user_detail should match snapshot if MF
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -860,7 +860,7 @@ exports[`components/admin_console/system_user_detail should match snapshot if SA
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1097,7 +1097,7 @@ exports[`components/admin_console/system_user_detail should match snapshot if no
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"
@ -1334,7 +1334,7 @@ exports[`components/admin_console/system_user_detail should match snapshot if us
className="admin-console-save"
>
<SaveButton
btnClass="btn-primary"
btnClass=""
defaultMessage={
<Memo(MemoizedFormattedMessage)
defaultMessage="Save"

12
webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/abstract_list.test.tsx.snap
View File

@ -243,7 +243,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</div>
<button
className="btn btn-link prev "
className="btn btn-tertiary prev "
disabled={false}
onClick={[Function]}
type="button"
@ -253,7 +253,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</button>
<button
className="btn btn-link next "
className="btn btn-tertiary next "
disabled={false}
onClick={[Function]}
type="button"
@ -472,7 +472,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -482,7 +482,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</button>
<button
className="btn btn-link next "
className="btn btn-tertiary next "
disabled={false}
onClick={[Function]}
type="button"
@ -589,7 +589,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
onClick={[Function]}
type="button"
@ -599,7 +599,7 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
disabled={true}
onClick={[Function]}
type="button"

2
webapp/channels/src/components/admin_console/system_user_detail/team_list/abstract_list.scss
View File

@ -52,7 +52,7 @@
border-top: solid 1px rgba(0, 0, 0, 0.1);
background: $white;
.btn-link {
.btn-tertiary {
color: $dark-gray;
&.disabled {

4
webapp/channels/src/components/admin_console/system_user_detail/team_list/abstract_list.tsx
View File

@ -161,7 +161,7 @@ export default class AbstractList extends React.PureComponent<Props, State> {
</div>
<button
type='button'
className={'btn btn-link prev ' + (firstPage ? 'disabled' : '')}
className={'btn btn-tertiary prev ' + (firstPage ? 'disabled' : '')}
onClick={firstPage ? () => null : this.previousPage}
disabled={firstPage}
>
@ -169,7 +169,7 @@ export default class AbstractList extends React.PureComponent<Props, State> {
</button>
<button
type='button'
className={'btn btn-link next ' + (lastPage ? 'disabled' : '')}
className={'btn btn-tertiary next ' + (lastPage ? 'disabled' : '')}
onClick={lastPage ? () => null : this.nextPage}
disabled={lastPage}
>

2
webapp/channels/src/components/admin_console/system_users/__snapshots__/system_users.test.tsx.snap
View File

@ -79,7 +79,7 @@ exports[`components/admin_console/system_users should match default snapshot 1`]
className="pt-3 pb-3"
>
<button
className="btn btn-default"
className="btn btn-tertiary"
id="revoke-all-users"
onClick={[Function]}
type="button"

2
webapp/channels/src/components/admin_console/system_users/system_users.tsx
View File

@ -407,7 +407,7 @@ export default class SystemUsers extends React.PureComponent<Props, State> {
<button
id='revoke-all-users'
type='button'
className='btn btn-default'
className='btn btn-tertiary'
onClick={() => this.handleShowRevokeAllSessionsModal()}
disabled={this.props.isDisabled}
>

4
webapp/channels/src/components/admin_console/team_channel_settings/__snapshots__/abstract_list.test.tsx.snap
View File

@ -108,7 +108,7 @@ exports[`admin_console/team_channel_settings/AbstractList should match snapshot,
/>
</div>
<button
className="btn btn-link prev disabled"
className="btn btn-tertiary prev disabled"
disabled={true}
type="button"
>
@ -117,7 +117,7 @@ exports[`admin_console/team_channel_settings/AbstractList should match snapshot,
/>
</button>
<button
className="btn btn-link next disabled"
className="btn btn-tertiary next disabled"
data-testid="page-link-next"
disabled={true}
type="button"

4
webapp/channels/src/components/admin_console/team_channel_settings/abstract_list.tsx
View File

@ -159,7 +159,7 @@ export default class AbstractList extends React.PureComponent<Props, State> {
</div>
<button
type='button'
className={'btn btn-link prev ' + (firstPage ? 'disabled' : '')}
className={'btn btn-tertiary prev ' + (firstPage ? 'disabled' : '')}
onClick={firstPage ? undefined : this.previousPage}
disabled={firstPage}
>
@ -167,7 +167,7 @@ export default class AbstractList extends React.PureComponent<Props, State> {
</button>
<button
type='button'
className={'btn btn-link next ' + (lastPage ? 'disabled' : '')}
className={'btn btn-tertiary next ' + (lastPage ? 'disabled' : '')}
onClick={lastPage ? undefined : this.nextPage}
disabled={lastPage}
data-testid='page-link-next'

12
webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_profile.test.tsx.snap
View File

@ -39,11 +39,11 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
className="AdminChannelDetails_archiveContainer"
>
<button
className="btn btn-secondary ArchiveButton ArchiveButton___unarchived"
className="btn btn-secondary btn-danger"
type="button"
>
<ArchiveIcon
className="channel-icon channel-icon__archive"
<i
className="icon icon-archive-outline"
/>
<MemoizedFormattedMessage
defaultMessage="Archive Channel"
@ -112,11 +112,11 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
className="AdminChannelDetails_archiveContainer"
>
<button
className="btn btn-secondary ArchiveButton ArchiveButton___unarchived"
className="btn btn-secondary btn-danger"
type="button"
>
<ArchiveIcon
className="channel-icon channel-icon__archive"
<i
className="icon icon-archive-outline"
/>
<MemoizedFormattedMessage
defaultMessage="Archive Channel"

10
webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx
View File

@ -11,8 +11,6 @@ import type {Team} from '@mattermost/types/teams';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import SharedChannelIndicator from 'components/shared_channel_indicator';
import AdminPanel from 'components/widgets/admin_console/admin_panel';
import ArchiveIcon from 'components/widgets/icons/archive_icon';
import UnarchiveIcon from 'components/widgets/icons/unarchive_icon';
import {t} from 'utils/i18n';
@ -95,15 +93,15 @@ export const ChannelProfile: React.SFC<ChannelProfileProps> = (props: ChannelPro
classNames(
'btn',
'btn-secondary',
'ArchiveButton',
{ArchiveButton___archived: isArchived},
{ArchiveButton___unarchived: !isArchived},
{'btn-danger': !isArchived},
{disabled: isDisabled},
)
}
onClick={props.onToggleArchive}
>
{isArchived ? <UnarchiveIcon className='channel-icon channel-icon__unarchive'/> : <ArchiveIcon className='channel-icon channel-icon__archive'/>}
{isArchived ?
<i className='icon icon-archive-arrow-up-outline'/> :
<i className='icon icon-archive-outline'/>}
<FormattedMessage
id={archiveBtnID}
defaultMessage={archiveBtnDefault}

2
webapp/channels/src/components/admin_console/team_channel_settings/errors.tsx
View File

@ -88,7 +88,7 @@ export const UsersWillBeRemovedError = ({users, total, scope, scopeId}: UsersWil
<span>
{error}
<ToggleModalButton
className='btn btn-link'
className='btn btn-tertiary'
modalId={ModalIdentifiers.USERS_TO_BE_REMOVED}
dialogType={UsersToBeRemovedModal}
dialogProps={{total, users, scope, scopeId}}

2
webapp/channels/src/components/admin_console/team_channel_settings/save_changes_panel.tsx
View File

@ -29,7 +29,7 @@ const SaveChangesPanel = ({saveNeeded, onClick, saving, serverError, cancelLink,
/>
<BlockableLink
id='cancelButtonSettings'
className='cancel-button'
className='btn btn-quaternary'
to={cancelLink}
>
<FormattedMessage

72
webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
View File

@ -321,30 +321,14 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
className="AdminChannelDetails_archiveContainer"
>
<button
className="btn btn-secondary ArchiveButton ArchiveButton___archived cloud-limits-disabled"
className="btn ArchiveButton ArchiveButton___archived cloud-limits-disabled"
disabled={false}
onClick={[Function]}
type="button"
>
<UnarchiveIcon
className="channel-icon channel-icon__unarchive"
>
<span
className="channel-icon channel-icon__unarchive"
>
<svg
aria-label="Archive Icon"
height="16px"
role="img"
viewBox="0 0 16 16"
width="16px"
>
<path
d="M13.994 14.75H2.006V6.50605H3.5V13.256H12.5V6.50605H13.994V14.75ZM1.25 1.25005H14.75V5.75005H1.25V1.25005ZM2.744 2.74405V4.25605H13.256V2.74405H2.744ZM6.884 11.744V9.49405H4.994L8 6.50605L11.006 9.49405H9.134V11.744H6.884Z"
/>
</svg>
</span>
</UnarchiveIcon>
<i
className="icon icon-archive-arrow-up-outline"
/>
<FormattedMessage
defaultMessage="Unarchive Team"
id="admin.team_settings.team_details.unarchiveTeam"
@ -682,7 +666,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
onMouseOver={[Function]}
>
<button
className="btn btn-secondary ArchiveButton ArchiveButton___archived cloud-limits-disabled"
className="btn btn-danger ArchiveButton ArchiveButton___archived cloud-limits-disabled"
disabled={true}
onClick={[Function]}
style={
@ -692,25 +676,9 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
}
type="button"
>
<UnarchiveIcon
className="channel-icon channel-icon__unarchive"
>
<span
className="channel-icon channel-icon__unarchive"
>
<svg
aria-label="Archive Icon"
height="16px"
role="img"
viewBox="0 0 16 16"
width="16px"
>
<path
d="M13.994 14.75H2.006V6.50605H3.5V13.256H12.5V6.50605H13.994V14.75ZM1.25 1.25005H14.75V5.75005H1.25V1.25005ZM2.744 2.74405V4.25605H13.256V2.74405H2.744ZM6.884 11.744V9.49405H4.994L8 6.50605L11.006 9.49405H9.134V11.744H6.884Z"
/>
</svg>
</span>
</UnarchiveIcon>
<i
className="icon icon-archive-arrow-up-outline"
/>
<FormattedMessage
defaultMessage="Unarchive Team"
id="admin.team_settings.team_details.unarchiveTeam"
@ -951,30 +919,14 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
className="AdminChannelDetails_archiveContainer"
>
<button
className="btn btn-secondary ArchiveButton ArchiveButton___unarchived cloud-limits-disabled"
className="btn ArchiveButton ArchiveButton___unarchived cloud-limits-disabled"
disabled={false}
onClick={[Function]}
type="button"
>
<ArchiveIcon
className="channel-icon channel-icon__archive"
>
<span
className="channel-icon channel-icon__archive"
>
<svg
aria-label="Archive Icon"
height="16px"
role="img"
viewBox="0 0 16 16"
width="16px"
>
<path
d="M13.994 14.75H2.006V6.50599H3.5V13.256H12.5V6.50599H13.994V14.75ZM1.25 1.24999H14.75V5.74999H1.25V1.24999ZM6.128 7.24399H9.872C9.98 7.24399 10.07 7.27999 10.142 7.35199C10.214 7.42399 10.25 7.51399 10.25 7.62199V8.75599H5.75V7.62199C5.75 7.51399 5.786 7.42399 5.858 7.35199C5.93 7.27999 6.02 7.24399 6.128 7.24399ZM2.744 2.74399V4.25599H13.256V2.74399H2.744Z"
/>
</svg>
</span>
</ArchiveIcon>
<i
className="icon icon-archive-outline"
/>
<FormattedMessage
defaultMessage="Archive Team"
id="admin.team_settings.team_details.archiveTeam"

17
webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_profile.tsx
View File

@ -20,8 +20,6 @@ import OverlayTrigger from 'components/overlay_trigger';
import PricingModal from 'components/pricing_modal';
import Tooltip from 'components/tooltip';
import AdminPanel from 'components/widgets/admin_console/admin_panel';
import ArchiveIcon from 'components/widgets/icons/archive_icon';
import UnarchiveIcon from 'components/widgets/icons/unarchive_icon';
import TeamIcon from 'components/widgets/team_icon/team_icon';
import {ModalIdentifiers} from 'utils/constants';
@ -106,7 +104,7 @@ export function TeamProfile({team, isArchived, onToggleArchive, isDisabled, save
className={
classNames(
'btn',
'btn-secondary',
'btn-danger',
'ArchiveButton',
{ArchiveButton___archived: isArchived},
{ArchiveButton___unarchived: !isArchived},
@ -117,11 +115,9 @@ export function TeamProfile({team, isArchived, onToggleArchive, isDisabled, save
onClick={noop}
>
{isArchived ? (
<UnarchiveIcon
className='channel-icon channel-icon__unarchive'
/>
<i className='icon icon-archive-arrow-up-outline'/>
) : (
<ArchiveIcon className='channel-icon channel-icon__archive'/>
<i className='icon icon-archive-outline'/>
)}
<FormattedMessage
id={archiveBtnID}
@ -140,7 +136,6 @@ export function TeamProfile({team, isArchived, onToggleArchive, isDisabled, save
className={
classNames(
'btn',
'btn-secondary',
'ArchiveButton',
{ArchiveButton___archived: isArchived},
{ArchiveButton___unarchived: !isArchived},
@ -151,11 +146,9 @@ export function TeamProfile({team, isArchived, onToggleArchive, isDisabled, save
onClick={toggleArchive}
>
{isArchived ? (
<UnarchiveIcon
className='channel-icon channel-icon__unarchive'
/>
<i className='icon icon-archive-arrow-up-outline'/>
) : (
<ArchiveIcon className='channel-icon channel-icon__archive'/>
<i className='icon icon-archive-outline'/>
)}
<FormattedMessage
id={archiveBtnID}

2
webapp/channels/src/components/apps_form/__snapshots__/apps_form_component.test.tsx.snap
View File

@ -193,7 +193,7 @@ exports[`AppsFormComponent should set match snapshot 1`] = `
>
<div>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
id="appsModalCancel"
onClick={[Function]}
type="button"

2
webapp/channels/src/components/apps_form/apps_form_component.tsx
View File

@ -562,7 +562,7 @@ export class AppsForm extends React.PureComponent<Props, State> {
<button
id='appsModalCancel'
type='button'
className='btn btn-link cancel-button'
className='btn btn-tertiary cancel-button'
onClick={this.onHide}
>
<FormattedMessage

2
webapp/channels/src/components/authorize/authorize.tsx
View File

@ -158,7 +158,7 @@ export default class Authorize extends React.PureComponent<Props, State> {
<div className='prompt__buttons'>
<button
type='submit'
className='btn btn-link authorize-btn'
className='btn btn-tertiary authorize-btn'
onClick={this.handleDeny}
>
<FormattedMessage

4
webapp/channels/src/components/browse_channels/__snapshots__/browse_channels.test.tsx.snap
View File

@ -20,7 +20,7 @@ exports[`components/BrowseChannels should match snapshot and state 1`] = `
>
<button
aria-label="Create New Channel"
className="btn outlineButton"
className="btn btn-secondary btn-sm"
id="createNewChannelButton"
onClick={[Function]}
type="button"
@ -138,7 +138,7 @@ exports[`components/BrowseChannels should match snapshot and state 1`] = `
>
<button
aria-label="Create New Channel"
className="btn primaryButton"
className="btn btn-primary"
id="createNewChannelButton"
onClick={[Function]}
type="button"

22
webapp/channels/src/components/browse_channels/browse_channels.scss
View File

@ -224,20 +224,6 @@
}
}
.outlineButton {
border: 1px solid var(--button-bg);
background: none;
border-radius: 4px;
color: var(--button-bg);
font-size: 12px;
font-weight: 600;
line-height: 16px;
}
.outlineButton:hover {
background-color: rgba(var(--button-bg-rgb), 0.08);
}
.filter-controls {
padding: 0;
@ -259,14 +245,6 @@
margin-bottom: 30px;
}
.primaryButton {
background-color: var(--button-bg);
border-radius: 4px;
color: var(--button-color);
font-size: 14px;
font-weight: 600;
}
#createNewChannelButton {
padding: 10px 20px;
}

4
webapp/channels/src/components/browse_channels/browse_channels.tsx
View File

@ -328,7 +328,7 @@ export default class BrowseChannels extends React.PureComponent<Props, State> {
defaultMessage='Try searching different keywords, checking for typos or adjusting the filters.'
/>
</p>
{createNewChannelButton('primaryButton', <i className='icon-plus'/>)}
{createNewChannelButton('btn-primary', <i className='icon-plus'/>)}
</>
);
@ -370,7 +370,7 @@ export default class BrowseChannels extends React.PureComponent<Props, State> {
aria-labelledby='browseChannelsModalLabel'
compassDesign={true}
modalHeaderText={title}
headerButton={createNewChannelButton('outlineButton')}
headerButton={createNewChannelButton('btn-secondary btn-sm')}
autoCloseOnConfirmButton={false}
aria-modal={true}
enforceFocus={false}

2
webapp/channels/src/components/channel_info_rhs/header.tsx
View File

@ -85,7 +85,7 @@ const Header = ({channel, isArchived, isMobile, onClose}: Props) => {
<button
id='rhsCloseButton'
type='button'
className='sidebar--right__close btn-icon'
className='sidebar--right__close btn btn-icon btn-sm'
aria-label='Close'
onClick={onClose}
>

6
webapp/channels/src/components/channel_invite_modal/__snapshots__/channel_invite_modal.test.tsx.snap
View File

@ -63,7 +63,7 @@ exports[`components/channel_invite_modal should match snapshot for channel_invit
>
<MultiSelect
ariaLabelRenderer={[Function]}
backButtonClass="btn-cancel tertiary-button"
backButtonClass="btn-tertiary tertiary-button"
backButtonClick={[Function]}
customNoOptionsMessage={null}
focusOnLoad={true}
@ -162,7 +162,7 @@ exports[`components/channel_invite_modal should match snapshot for channel_invit
>
<MultiSelect
ariaLabelRenderer={[Function]}
backButtonClass="btn-cancel tertiary-button"
backButtonClass="btn-tertiary tertiary-button"
backButtonClick={[Function]}
customNoOptionsMessage={null}
focusOnLoad={true}
@ -283,7 +283,7 @@ exports[`components/channel_invite_modal should match snapshot with exclude and
>
<MultiSelect
ariaLabelRenderer={[Function]}
backButtonClass="btn-cancel tertiary-button"
backButtonClass="btn-tertiary tertiary-button"
backButtonClick={[Function]}
customNoOptionsMessage={null}
focusOnLoad={true}

4
webapp/channels/src/components/channel_invite_modal/channel_invite_modal.tsx
View File

@ -474,7 +474,7 @@ export default class ChannelInviteModal extends React.PureComponent<Props, State
return (
<ToggleModalButton
id='inviteGuest'
className={`${props.inviteAsGuest ? 'invite-as-guest' : ''} btn btn-link`}
className={`${props.inviteAsGuest ? 'invite-as-guest' : ''} btn btn-tertiary`}
modalId={ModalIdentifiers.INVITATION}
dialogType={InvitationModal}
dialogProps={{
@ -529,7 +529,7 @@ export default class ChannelInviteModal extends React.PureComponent<Props, State
valueWithImage={true}
backButtonText={localizeMessage('multiselect.cancel', 'Cancel')}
backButtonClick={closeMembersInviteModal}
backButtonClass={'btn-cancel tertiary-button'}
backButtonClass={'btn-tertiary tertiary-button'}
customNoOptionsMessage={this.props.emailInvitationsEnabled ? customNoOptionsMessage : null}
/>
);

2
webapp/channels/src/components/channel_members_rhs/header.tsx
View File

@ -81,7 +81,7 @@ const Header = ({channel, canGoBack, onClose, goBack}: Props) => {
<button
id='rhsCloseButton'
type='button'
className='sidebar--right__close btn-icon'
className='sidebar--right__close btn btn-icon btn-sm'
aria-label='Close'
onClick={onClose}
>

2
webapp/channels/src/components/confirm_modal.tsx
View File

@ -147,7 +147,7 @@ export default class ConfirmModal extends React.Component<Props, State> {
cancelButton = (
<button
type='button'
className='btn btn-link btn-cancel'
className='btn btn-tertiary'
onClick={this.handleCancel}
id='cancelModalButton'
>

2
webapp/channels/src/components/convert_channel_modal/convert_channel_modal.tsx
View File

@ -111,7 +111,7 @@ export default class ConvertChannelModal extends React.PureComponent<Props, Stat
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.onHide}
>
<FormattedMessage

4
webapp/channels/src/components/create_team/components/__snapshots__/display_name.test.tsx.snap
View File

@ -55,8 +55,8 @@ exports[`/components/create_team/components/display_name should match snapshot 1
defaultMessage="Next"
id="create_team.display_name.next"
/>
<NextIcon
additionalClassName={null}
<i
className="icon icon-chevron-right"
/>
</button>
</form>

4
webapp/channels/src/components/create_team/components/display_name.tsx
View File

@ -8,8 +8,6 @@ import type {Team} from '@mattermost/types/teams';
import {trackEvent} from 'actions/telemetry_actions.jsx';
import NextIcon from 'components/widgets/icons/fa_next_icon';
import logoImage from 'images/logo.png';
import Constants from 'utils/constants';
import {cleanUpUrlable} from 'utils/url';
@ -150,7 +148,7 @@ export default class TeamSignupDisplayNamePage extends React.PureComponent<Props
id='create_team.display_name.next'
defaultMessage='Next'
/>
<NextIcon/>
<i className='icon icon-chevron-right'/>
</button>
</form>
</div>

2
webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
View File

@ -38,7 +38,7 @@ exports[`component/create_user_groups_modal should match snapshot with back butt
>
<button
aria-label="Back"
className="modal-header-back-button btn-icon"
className="modal-header-back-button btn btn-icon"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
View File

@ -181,7 +181,7 @@ export default class CreateUserGroupsModal extends React.PureComponent<Props, St
<>
<button
type='button'
className='modal-header-back-button btn-icon'
className='modal-header-back-button btn btn-icon'
aria-label='Back'
onClick={() => {
this.goBack();

2
webapp/channels/src/components/delete_channel_modal/__snapshots__/delete_channel_modal.test.tsx.snap
View File

@ -70,7 +70,7 @@ exports[`components/delete_channel_modal should match snapshot for delete_channe
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/delete_channel_modal/delete_channel_modal.tsx
View File

@ -95,7 +95,7 @@ export default class DeleteChannelModal extends React.PureComponent<Props, State
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.onHide}
>
<FormattedMessage

6
webapp/channels/src/components/delete_post_modal/__snapshots__/delete_post_modal.test.tsx.snap
View File

@ -80,7 +80,7 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>
@ -194,7 +194,7 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>
@ -299,7 +299,7 @@ exports[`components/delete_post_modal should match snapshot for post with 1 comm
componentClass="div"
>
<button
className="btn btn-link"
className="btn btn-tertiary"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/delete_post_modal/delete_post_modal.tsx
View File

@ -166,7 +166,7 @@ export default class DeletePostModal extends React.PureComponent<Props, State> {
<Modal.Footer>
<button
type='button'
className='btn btn-link'
className='btn btn-tertiary'
onClick={this.onHide}
>
<FormattedMessage

10
webapp/channels/src/components/edit_channel_header_modal/__snapshots__/edit_channel_header_modal.test.tsx.snap
View File

@ -98,7 +98,7 @@ exports[`components/EditChannelHeaderModal edit direct message channel 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -243,7 +243,7 @@ exports[`components/EditChannelHeaderModal error with intl message 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -380,7 +380,7 @@ exports[`components/EditChannelHeaderModal error without intl message 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -507,7 +507,7 @@ exports[`components/EditChannelHeaderModal should match snapshot, init 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -634,7 +634,7 @@ exports[`components/EditChannelHeaderModal submitted 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>

2
webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
View File

@ -294,7 +294,7 @@ export default class EditChannelHeaderModal extends React.PureComponent<Props, S
<Modal.Footer>
<button
type='button'
className='btn btn-link cancel-button'
className='btn btn-tertiary cancel-button'
onClick={this.hideModal}
>
<FormattedMessage

28
webapp/channels/src/components/edit_channel_purpose_modal/__snapshots__/edit_channel_purpose_modal.test.tsx.snap
View File

@ -89,7 +89,7 @@ exports[`comoponents/EditChannelPurposeModal clear error on next 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -99,7 +99,7 @@ exports[`comoponents/EditChannelPurposeModal clear error on next 1`] = `
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -202,7 +202,7 @@ exports[`comoponents/EditChannelPurposeModal match with modal error 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -212,7 +212,7 @@ exports[`comoponents/EditChannelPurposeModal match with modal error 1`] = `
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -315,7 +315,7 @@ exports[`comoponents/EditChannelPurposeModal match with modal error with fake id
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -325,7 +325,7 @@ exports[`comoponents/EditChannelPurposeModal match with modal error with fake id
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -418,7 +418,7 @@ exports[`comoponents/EditChannelPurposeModal should match for private channel 1`
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -428,7 +428,7 @@ exports[`comoponents/EditChannelPurposeModal should match for private channel 1`
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -521,7 +521,7 @@ exports[`comoponents/EditChannelPurposeModal should match on init 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -531,7 +531,7 @@ exports[`comoponents/EditChannelPurposeModal should match on init 1`] = `
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -632,7 +632,7 @@ exports[`comoponents/EditChannelPurposeModal should match submitted 1`] = `
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -642,7 +642,7 @@ exports[`comoponents/EditChannelPurposeModal should match submitted 1`] = `
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@ -736,7 +736,7 @@ exports[`comoponents/EditChannelPurposeModal should match with display name 1`]
componentClass="div"
>
<button
className="btn btn-link cancel-button"
className="btn btn-tertiary cancel-button"
onClick={[Function]}
type="button"
>
@ -746,7 +746,7 @@ exports[`comoponents/EditChannelPurposeModal should match with display name 1`]
/>
</button>
<button
className="btn btn-primary save-button"
className="btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"

2
webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.test.tsx
View File

@ -200,7 +200,7 @@ describe('comoponents/EditChannelPurposeModal', () => {
{disableLifecycleMethods: true},
);
wrapper.find('.save-button').simulate('click');
wrapper.find('.btn-primary').simulate('click');
expect(patchChannel).toBeCalledWith('channel_id', {purpose: 'testPurpose'});
});

4
webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
View File

@ -193,7 +193,7 @@ export class EditChannelPurposeModal extends React.PureComponent<Props, State> {
<Modal.Footer>
<button
type='button'
className='btn btn-link cancel-button'
className='btn btn-tertiary cancel-button'
onClick={this.onHide}
>
<FormattedMessage
@ -203,7 +203,7 @@ export class EditChannelPurposeModal extends React.PureComponent<Props, State> {
</button>
<button
type='button'
className='btn btn-primary save-button'
className='btn btn-primary'
disabled={this.state.requestStarted}
onClick={this.handleSave}
>

6
webapp/channels/src/components/emoji/add_emoji/__snapshots__/add_emoji.test.tsx.snap
View File

@ -113,7 +113,7 @@ exports[`components/emoji/components/AddEmoji should match snapshot 1`] = `
type="backstage"
/>
<Link
className="btn btn-link btn-sm"
className="btn btn-tertiary"
to="/undefined/emoji"
>
<MemoizedFormattedMessage
@ -288,7 +288,7 @@ exports[`components/emoji/components/AddEmoji should select a file and match sna
type="backstage"
/>
<Link
className="btn btn-link btn-sm"
className="btn btn-tertiary"
to="/undefined/emoji"
>
<MemoizedFormattedMessage
@ -427,7 +427,7 @@ exports[`components/emoji/components/AddEmoji should update emoji name and match
type="backstage"
/>
<Link
className="btn btn-link btn-sm"
className="btn btn-tertiary"
to="/undefined/emoji"
>
<MemoizedFormattedMessage

Some files were not shown because too many files have changed in this diff Show More