diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6 index 0a1947e4b4c..feab25677b9 100644 --- a/app/assets/javascripts/admin/components/admin-report.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report.js.es6 @@ -140,7 +140,7 @@ export default Ember.Component.extend({ const modes = forcedModes ? forcedModes.split(",") : reportModes; return Ember.makeArray(modes).map(mode => { - const base = `mode-btn ${mode}`; + const base = `btn-default mode-btn ${mode}`; const cssClass = currentMode === mode ? `${base} is-current` : base; return { diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs index e1907da87ff..e256e127cf9 100644 --- a/app/assets/javascripts/admin/templates/api-keys.hbs +++ b/app/assets/javascripts/admin/templates/api-keys.hbs @@ -19,8 +19,8 @@ {{/if}} - {{d-button action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}} - {{d-button action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}} + {{d-button class="btn-default" action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}} + {{d-button class="btn-default" action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}} {{/each}} diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs index bcf8dccaa4d..0e9e97037fb 100644 --- a/app/assets/javascripts/admin/templates/backups-index.hbs +++ b/app/assets/javascripts/admin/templates/backups-index.hbs @@ -1,14 +1,14 @@
{{#if localBackupStorage}} - {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}} + {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title" class="btn-default"}} {{else}} {{backup-uploader done="remoteUploadSuccess"}} {{/if}} {{#if site.isReadOnly}} - {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}} + {{d-button class="btn-default" icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}} {{else}} - {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}} + {{d-button class="btn-default" icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}} {{/if}}
@@ -24,7 +24,7 @@ diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs index fe7861839f1..21b104a9b24 100644 --- a/app/assets/javascripts/admin/templates/backups.hbs +++ b/app/assets/javascripts/admin/templates/backups.hbs @@ -8,7 +8,7 @@
{{#if model.canRollback}} {{d-button action="rollback" - class="btn-rollback" + class="btn-default btn-rollback" label="admin.backups.operations.rollback.label" title="admin.backups.operations.rollback.title" icon="ambulance" diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs index 4a71e7d69a0..c0abf3f991f 100644 --- a/app/assets/javascripts/admin/templates/badges-index.hbs +++ b/app/assets/javascripts/admin/templates/badges-index.hbs @@ -2,7 +2,7 @@

{{i18n 'admin.badges.none_selected'}}

- {{#link-to 'adminBadges.show' 'new' class="btn"}} + {{#link-to 'adminBadges.show' 'new' class="btn btn-default"}} {{d-icon "plus"}} {{i18n 'admin.badges.new'}} {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs index 7436c48898f..f8995fd5401 100644 --- a/app/assets/javascripts/admin/templates/badges-show.hbs +++ b/app/assets/javascripts/admin/templates/badges-show.hbs @@ -36,7 +36,7 @@ value=buffered.badge_grouping_id content=badgeGroupings nameProperty="name"}} -   +  
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs index b5789d4c42a..04b60d10e20 100644 --- a/app/assets/javascripts/admin/templates/badges.hbs +++ b/app/assets/javascripts/admin/templates/badges.hbs @@ -14,7 +14,7 @@ {{/each}} - {{#link-to 'adminBadges.show' 'new' class="btn"}} + {{#link-to 'adminBadges.show' 'new' class="btn btn-default"}} {{d-icon "plus"}} {{i18n 'admin.badges.new'}} {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs index 9024f099f06..fb24af76c32 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs @@ -167,7 +167,7 @@
{{d-button - class="export-csv-btn" + class="btn-default export-csv-btn" action="exportCsv" label="admin.export_csv.button_text" icon="download"}} diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs index 99f1de8ce24..0074c99f1a3 100644 --- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs @@ -48,8 +48,8 @@
{{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}} {{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}} - {{d-button action="moveUp" icon="arrow-up" disabled=cantMoveUp}} - {{d-button action="moveDown" icon="arrow-down" disabled=cantMoveDown}} + {{d-button action="moveUp" class="btn-default" icon="arrow-up" disabled=cantMoveUp}} + {{d-button action="moveDown" class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
{{flags}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs index 37631f1442f..0ef0f3d8a4e 100644 --- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs +++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs @@ -77,21 +77,21 @@ {{#if flaggedPost.postHidden}} {{d-button title="admin.flags.disagree_flag_unhide_post_title" - class="disagree-flag" + class="btn-default disagree-flag" action="disagree" icon="thumbs-o-down" label="admin.flags.disagree_flag_unhide_post"}} {{else}} {{d-button title="admin.flags.disagree_flag_title" - class="disagree-flag" + class="btn-default disagree-flag" action="disagree" icon="thumbs-o-down" label="admin.flags.disagree_flag"}} {{/if}} {{d-button - class="defer-flag" + class="btn-default defer-flag" title="admin.flags.ignore_flag_title" action="defer" icon="external-link" @@ -103,6 +103,7 @@ {{/if}} {{d-button + class="btn-default" icon="list" label="admin.flags.moderation_history" action=(action "showModerationHistory")}} diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs index c7942543316..dc37c009915 100644 --- a/app/assets/javascripts/admin/templates/components/permalink-form.hbs +++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs @@ -2,4 +2,4 @@ {{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}} {{combo-box content=permalinkTypes value=permalinkType}} {{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}} -{{d-button action="submit" disabled=formSubmitted label="admin.permalink.form.add"}} +{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.permalink.form.add"}} diff --git a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs index e846b1c6527..82fb3162e2d 100644 --- a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs +++ b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs @@ -1,4 +1,4 @@ {{i18n 'admin.logs.screened_ips.form.label'}} {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}} {{combo-box content=actionNames value=actionName}} -{{d-button action="submit" disabled=formSubmitted label="admin.logs.screened_ips.form.add"}} +{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.logs.screened_ips.form.add"}} diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs index 558781c33d5..a832080ea77 100644 --- a/app/assets/javascripts/admin/templates/components/site-setting.hbs +++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs @@ -13,5 +13,5 @@ {{#if setting.secret}} {{d-button action="toggleSecret" icon="eye-slash"}} {{/if}} - {{d-button class="undo" action="resetDefault" icon="undo" label="admin.settings.reset"}} + {{d-button class="btn-default undo" action="resetDefault" icon="undo" label="admin.settings.reset"}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs index bf5ee8c7f03..60cfc9843dd 100644 --- a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs +++ b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs @@ -1,4 +1,4 @@ -{{d-button label="admin.site_text.edit" class='edit' action="edit"}} +{{d-button label="admin.site_text.edit" class='btn-default edit' action="edit"}}

{{siteText.id}}

{{siteText.value}}
diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs index 94a63000f83..d74b600ca4c 100644 --- a/app/assets/javascripts/admin/templates/components/value-list.hbs +++ b/app/assets/javascripts/admin/templates/components/value-list.hbs @@ -5,7 +5,7 @@ {{d-button action="removeValue" actionParam=value icon="times" - class="remove-value-btn btn-small"}} + class="btn-default remove-value-btn btn-small"}} {{input title=value value=value class="value-input" focus-out=(action "changeValue" index)}}
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs index e4b2fab801f..2b109e73857 100644 --- a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs +++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs @@ -1,6 +1,6 @@ {{i18n 'admin.watched_words.form.label'}} {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}} -{{d-button action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}} +{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}} {{#if showMessage}} {{message}} diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs index e69083494fb..d7c7f2a572e 100644 --- a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs +++ b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs @@ -1,4 +1,4 @@ - diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs index 761996b6cb9..b09fc1855ac 100644 --- a/app/assets/javascripts/admin/templates/customize-colors.hbs +++ b/app/assets/javascripts/admin/templates/customize-colors.hbs @@ -9,7 +9,7 @@ {{/unless}} {{/each}} - + {{outlet}} diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs index c957a44c47e..fd540a694e1 100644 --- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs @@ -50,10 +50,10 @@ icon="paint-brush"}} {{#if colorSchemeChanged}} {{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}} - {{d-button action="cancelChangeScheme" class="btn-small cancel-edit" icon="times"}} + {{d-button action="cancelChangeScheme" class="btn-default btn-small cancel-edit" icon="times"}} {{/if}} - {{#link-to 'adminCustomize.colors' class="btn edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}} + {{#link-to 'adminCustomize.colors' class="btn btn-default edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}} {{/unless}} @@ -76,11 +76,11 @@ {{#if model.remote_theme.commits_behind}} {{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}} {{else}} - {{#d-button action="checkForThemeUpdates" icon="refresh"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}} + {{#d-button action="checkForThemeUpdates" icon="refresh" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}} {{/if}} {{/if}} - {{#d-button action="editTheme" class="btn edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}} + {{#d-button action="editTheme" class="btn btn-default edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}} {{#if model.remote_theme}} {{#if updatingRemote}} @@ -119,7 +119,7 @@
  • ${{upload.name}}: {{upload.filename}} - {{d-button action="removeUpload" actionParam=upload class="second btn-small cancel-edit" icon="times"}} + {{d-button action="removeUpload" actionParam=upload class="second btn-default btn-small cancel-edit" icon="times"}}
    • {{/each}} @@ -127,7 +127,7 @@ {{else}}
    {{i18n "admin.customize.theme.no_uploads"}}
    {{/if}} - {{#d-button action="addUploadModal" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}} + {{#d-button action="addUploadModal" class="btn-default" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}} {{#if hasSettings}} @@ -147,22 +147,22 @@ {{#if model.childThemes.length}} {{/if}} {{#if selectableChildThemes}}
    {{combo-box forceEscape=true filterable=true content=selectableChildThemes value=selectedChildThemeId none="admin.customize.theme.select_component"}} - {{#d-button action="addChildTheme" icon="plus" disabled=addButtonDisabled class="add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}} + {{#d-button action="addChildTheme" icon="plus" disabled=addButtonDisabled class="btn-default add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
    {{/if}} {{/if}} - {{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}} - {{d-icon "download"}} {{i18n 'admin.export_json.button_text'}} + {{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}} + {{d-icon "download"}} {{i18n 'admin.export_json.button_text'}} - {{d-button action="switchType" label="admin.customize.theme.convert" icon=convertIcon class="btn-normal" title=convertTooltip}} + {{d-button action="switchType" label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}} {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}} diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs index 6d3e0648cfa..82985568c2f 100644 --- a/app/assets/javascripts/admin/templates/customize-themes.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes.hbs @@ -4,7 +4,7 @@
    {{d-button label="admin.customize.new" icon="plus" action="showCreateModal" class="btn-primary"}} - {{d-button action="importModal" icon="upload" label="admin.customize.import"}} + {{d-button action="importModal" icon="upload" label="admin.customize.import" class="btn-default"}}
    {{themes-list themes=fullThemes components=childThemes currentTab=currentTab}} diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs index 81bee62b289..c0c6b9ca0b6 100644 --- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs +++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs @@ -19,7 +19,7 @@

    {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}} - {{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}} + {{d-button action="refreshProblems" class="btn-default btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}

    {{/conditional-loading-section}} diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs index 88f36a5d590..bb6b5270e79 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs @@ -137,7 +137,7 @@

    {{i18n "admin.dashboard.last_updated"}}

    {{updatedTimestamp}}

    - + {{i18n "admin.dashboard.whats_new_in_discourse"}}
    diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs index 87372268c74..70fe22afe65 100644 --- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs +++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs @@ -29,7 +29,7 @@ {{else}} {{text-field value=email placeholderKey="admin.email.test_email_address"}} - + {{#if sentEmail}} {{i18n 'admin.email.sent_test'}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs index ce0dd4e3554..2d96b2a38e1 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs @@ -1,7 +1,7 @@

    {{i18n 'admin.logs.screened_emails.description'}}

    - +
    diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs index 4c1654c0f27..ea7bc1da7d6 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs @@ -3,8 +3,8 @@
    {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}} - {{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}} - {{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}} + {{d-button class="btn-default" action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}} + {{d-button class="btn-default" action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
    {{screened-ip-address-form action="recordAdded"}}
    @@ -57,15 +57,15 @@     diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs index 3a5a69c955a..c2a526e5f75 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs @@ -1,7 +1,7 @@

    {{i18n 'admin.logs.screened_urls.description'}}

    - +
    {{#conditional-loading-spinner condition=loading}} diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs index 399a824d623..63ce3d41ab0 100644 --- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs +++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs @@ -33,7 +33,7 @@ {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}} {{/if}} - {{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}} + {{d-button class="btn-default" action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
    diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index cc121e2940a..5704ca76e86 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -49,7 +49,7 @@ diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs index d37e8bcaa5c..12d9c8c8f64 100644 --- a/app/assets/javascripts/admin/templates/plugins.hbs +++ b/app/assets/javascripts/admin/templates/plugins.hbs @@ -6,7 +6,7 @@ {{#if currentUser.admin}} {{d-button label="admin.plugins.change_settings" icon="gear" - class='settings-button' + class="btn-default settings-button" action="showSettings"}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs index 8a1b8afcf3b..1d1e579d7a1 100644 --- a/app/assets/javascripts/admin/templates/site-settings.hbs +++ b/app/assets/javascripts/admin/templates/site-settings.hbs @@ -3,7 +3,7 @@
    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}} {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}} - {{d-button id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}} + {{d-button class="btn-default" id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}}
    @@ -48,10 +48,10 @@
    {{#if editingName}} - {{d-button action="saveName" label="admin.user_fields.save"}} + {{d-button class="btn-default" action="saveName" label="admin.user_fields.save"}} {{i18n 'cancel'}} {{else}} - {{d-button action="toggleNameEdit" icon="pencil"}} + {{d-button class="btn-default" action="toggleNameEdit" icon="pencil"}} {{/if}}
    @@ -68,7 +68,7 @@ {{#if model.email}} {{model.email}} {{else}} - {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} + {{d-button class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} {{/if}} @@ -89,6 +89,7 @@ {{/if}} {{else}} {{d-button action="checkEmail" + class="btn-default" actionParam=model icon="envelope-o" label="admin.users.check_email.text" @@ -102,7 +103,7 @@
    {{model.bounceScore}}
    {{#if model.canResetBounceScore}} - {{d-button action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}} + {{d-button class="btn-default" action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}} {{/if}} {{model.bounceScoreExplanation}}
    @@ -114,7 +115,7 @@ {{#if associatedAccountsLoaded}} {{associatedAccounts}} {{else}} - {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} + {{d-button class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} {{/if}} @@ -139,10 +140,10 @@
    {{#if editingTitle}} - {{d-button action="saveTitle" label="admin.user_fields.save"}} + {{d-button class="btn-default" action="saveTitle" label="admin.user_fields.save"}} {{i18n 'cancel'}} {{else}} - {{d-button action="toggleTitleEdit" icon="pencil"}} + {{d-button class="btn-default" action="toggleTitleEdit" icon="pencil"}} {{/if}}
    @@ -152,7 +153,7 @@
    {{model.ip_address}}
    {{#if currentUser.staff}} - {{d-button action="refreshBrowsers" label="admin.user.refresh_browsers"}} + {{d-button class="btn-default" action="refreshBrowsers" label="admin.user.refresh_browsers"}} {{ip-lookup ip=model.ip_address userId=model.id}} {{/if}}
    @@ -191,7 +192,7 @@
    {{#if canDisableSecondFactor}} - {{d-button action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}} + {{d-button class="btn-default" action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}} {{/if}}
    @@ -236,7 +237,7 @@ {{i18n 'admin.user.approve_success'}} {{else}} {{#if model.can_approve}} - {{d-button action="approve" icon="check" label="admin.user.approve"}} + {{d-button class="btn-default" action="approve" icon="check" label="admin.user.approve"}} {{/if}} {{/if}} @@ -249,15 +250,15 @@
    {{#if model.active}} {{#if model.can_deactivate}} - {{d-button action="deactivate" label="admin.user.deactivate_account"}} + {{d-button class="btn-default" action="deactivate" label="admin.user.deactivate_account"}} {{i18n 'admin.user.deactivate_explanation'}} {{/if}} {{else}} {{#if model.can_send_activation_email}} - {{d-button action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}} + {{d-button class="btn-default" action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}} {{/if}} {{#if model.can_activate}} - {{d-button action="activate" icon="check" label="admin.user.activate"}} + {{d-button class="btn-default" action="activate" icon="check" label="admin.user.activate"}} {{/if}} {{/if}}
    @@ -275,15 +276,15 @@ {{#if model.api_key}}
    {{model.api_key.key}} - {{d-button action="regenerateApiKey" icon="undo" label="admin.api.regenerate"}} - {{d-button action="revokeApiKey" icon="times" label="admin.api.revoke"}} + {{d-button class="btn-default" action="regenerateApiKey" icon="undo" label="admin.api.regenerate"}} + {{d-button class="btn-default" action="revokeApiKey" icon="times" label="admin.api.revoke"}}
    {{else}}
    —
    - {{d-button action="generateApiKey" icon="key" label="admin.api.generate"}} + {{d-button class="btn-default" action="generateApiKey" icon="key" label="admin.api.generate"}}
    {{/if}} @@ -294,10 +295,10 @@
    {{i18n-yes-no model.admin}}
    {{#if model.can_revoke_admin}} - {{d-button action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}} + {{d-button class="btn-default" action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}} {{/if}} {{#if model.can_grant_admin}} - {{d-button action="grantAdmin" icon="shield" label="admin.user.grant_admin"}} + {{d-button class="btn-default" action="grantAdmin" icon="shield" label="admin.user.grant_admin"}} {{/if}}
    @@ -307,10 +308,10 @@
    {{i18n-yes-no model.moderator}}
    {{#if model.can_revoke_moderation}} - {{d-button action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}} + {{d-button class="btn-default" action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}} {{/if}} {{#if model.can_grant_moderation}} - {{d-button action="grantModeration" icon="shield" label="admin.user.grant_moderation"}} + {{d-button class="btn-default" action="grantModeration" icon="shield" label="admin.user.grant_moderation"}} {{/if}}
    @@ -330,14 +331,14 @@ {{#if model.canLockTrustLevel}} {{#if hasLockedTrustLevel}} {{d-icon "lock" title="admin.user.trust_level_locked_tip"}} - {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}} + {{d-button class="btn-default" action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}} {{else}} {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}} - {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}} + {{d-button class="btn-default" action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}} {{/if}} {{/if}} {{#if model.tl3Requirements}} - {{#link-to 'adminUser.tl3Requirements' model class="btn"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}} + {{#link-to 'adminUser.tl3Requirements' model class="btn btn-default"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}} {{/if}} @@ -439,6 +440,7 @@ {{#if currentUser.admin}}
    {{d-button label="admin.user.clear_penalty_history.title" + class="btn-default" icon="times" action=(action "clearPenaltyHistory")}} {{i18n "admin.user.clear_penalty_history.description"}} @@ -537,6 +539,7 @@
    {{#if model.flags_received_count}} {{d-button + class="btn-default" action=(action "showFlagsReceived") label="admin.user.show_flags_received" icon="flag" diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index b54d8214da7..e0acb5fc435 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -8,7 +8,7 @@

    {{title}}

    {{#unless showEmails}} - + {{/unless}}
    diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs index bddc514effa..92c5c689ad8 100644 --- a/app/assets/javascripts/admin/templates/users-list.hbs +++ b/app/assets/javascripts/admin/templates/users-list.hbs @@ -14,10 +14,10 @@ {{nav-item route='groups' label='groups.index.title'}}
    {{#unless siteSettings.enable_sso}} - {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} + {{d-button class="btn-default" action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} {{/unless}} {{#if currentUser.admin}} - {{d-button action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}} + {{d-button class="btn-default" action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}} {{/if}}
    diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs index 6a5c57f7dcd..a9d30ac4b9f 100644 --- a/app/assets/javascripts/admin/templates/web-hooks.hbs +++ b/app/assets/javascripts/admin/templates/web-hooks.hbs @@ -2,7 +2,7 @@

    {{i18n 'admin.web_hooks.instruction'}}

    - {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}} + {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn btn-default'}} {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}} {{/link-to}}
    diff --git a/app/assets/javascripts/discourse/components/share-button.js.es6 b/app/assets/javascripts/discourse/components/share-button.js.es6 index 888d8a0c2c6..958f821ce6a 100644 --- a/app/assets/javascripts/discourse/components/share-button.js.es6 +++ b/app/assets/javascripts/discourse/components/share-button.js.es6 @@ -1,7 +1,7 @@ import Button from "discourse/components/d-button"; export default Button.extend({ - classNames: ["share"], + classNames: ["btn-default", "share"], icon: "link", title: "topic.share.help", label: "topic.share.title", diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 index 651c9a2e742..8703739cdbd 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 @@ -21,24 +21,45 @@ function addBulkButton(action, key, opts) { } // Default buttons -addBulkButton("showChangeCategory", "change_category", { icon: "pencil" }); -addBulkButton("closeTopics", "close_topics", { icon: "lock" }); -addBulkButton("archiveTopics", "archive_topics", { icon: "folder" }); -addBulkButton("showNotificationLevel", "notification_level", { - icon: "d-regular" +addBulkButton("showChangeCategory", "change_category", { + icon: "pencil", + class: "btn-default" +}); +addBulkButton("closeTopics", "close_topics", { + icon: "lock", + class: "btn-default" +}); +addBulkButton("archiveTopics", "archive_topics", { + icon: "folder", + class: "btn-default" +}); +addBulkButton("showNotificationLevel", "notification_level", { + icon: "d-regular", + class: "btn-default" +}); +addBulkButton("resetRead", "reset_read", { + icon: "backward", + class: "btn-default" }); -addBulkButton("resetRead", "reset_read", { icon: "backward" }); addBulkButton("unlistTopics", "unlist_topics", { icon: "eye-slash", + class: "btn-default", buttonVisible: topics => topics.some(t => t.visible) }); addBulkButton("relistTopics", "relist_topics", { icon: "eye", + class: "btn-default", buttonVisible: topics => topics.some(t => !t.visible) }); if (Discourse.SiteSettings.tagging_enabled) { - addBulkButton("showTagTopics", "change_tags", { icon: "tag" }); - addBulkButton("showAppendTagTopics", "append_tags", { icon: "tag" }); + addBulkButton("showTagTopics", "change_tags", { + icon: "tag", + class: "btn-default" + }); + addBulkButton("showAppendTagTopics", "append_tags", { + icon: "tag", + class: "btn-default" + }); } addBulkButton("deleteTopics", "delete", { icon: "trash", class: "btn-danger" }); diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs index 4dad7efb0c4..822c97b5440 100644 --- a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs +++ b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs @@ -1,5 +1,5 @@ {{#if selected}}
    - {{d-button action="showBulkActions" icon="wrench"}} + {{d-button class="btn-default" action="showBulkActions" icon="wrench"}}
    {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs index 7761050a38a..1a4314acce7 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs @@ -7,7 +7,7 @@ {{latest-topic-list-item topic=t}} {{/each}}
    - {{i18n "more"}} + {{i18n "more"}}
    {{else}}
    diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs index d1ffffbdee7..bb94b11c99d 100644 --- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs +++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs @@ -1,15 +1,15 @@ {{#if isNotSupported}} - {{d-button icon="bell-slash" label="user.desktop_notifications.not_supported" disabled="true"}} + {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}} {{/if}} {{#if isDeniedPermission}} - {{d-button icon="bell-slash" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}} + {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}} {{i18n "user.desktop_notifications.perm_denied_expl"}} {{else}} {{#if isEnabled}} - {{d-button icon="bell-slash-o" label="user.desktop_notifications.disable" action="turnoff"}} + {{d-button icon="bell-slash-o" class="btn-default" label="user.desktop_notifications.disable" action="turnoff"}} {{i18n "user.desktop_notifications.currently_enabled"}} {{else}} - {{d-button icon="bell-o" label="user.desktop_notifications.enable" action="turnon"}} + {{d-button icon="bell-o" class="btn-default" label="user.desktop_notifications.enable" action="turnon"}} {{i18n "user.desktop_notifications.currently_disabled"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs index ad078cda2f0..dec825ae6a4 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs @@ -32,7 +32,7 @@ {{/if}} {{else}} {{#unless category.is_special}} - + {{/unless}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs index 8eb03a01457..938be5c503c 100644 --- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs +++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs @@ -1,6 +1,6 @@
    -
    {{human-size backup.size}}
    - {{d-button class="download" + {{d-button class="btn-default download" action="download" actionParam=backup icon="download" @@ -32,10 +32,10 @@ label="admin.backups.operations.download.label"}} {{#if status.isOperationRunning}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} - {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} + {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}} {{else}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}} - {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} + {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}} {{/if}}
    		{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}} {{#unless model.theme_id}} - - + + {{/unless}}
    {{#unless item.editing}} - {{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}} - {{d-button action="edit" actionParam=item icon="pencil"}} + {{d-button class="btn-default" action="destroy" actionParam=item icon="trash-o" class="btn-danger"}} + {{d-button class="btn-default"action="edit" actionParam=item icon="pencil"}} {{#if item.isBlocked}} - {{d-button action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} + {{d-button class="btn-default" action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} {{else}} - {{d-button action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}} + {{d-button class="btn-default" action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}} {{/if}} {{else}} - {{d-button action="save" actionParam=item label="admin.logs.save"}} + {{d-button class="btn-default" action="save" actionParam=item label="admin.logs.save"}} {{i18n 'cancel'}} {{/unless}} {{#if currentUser.admin}} {{#if plugin.enabled_setting}} - {{d-button action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}} + {{d-button class="btn-default" action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}} {{/if}} {{/if}}
    {{number-field number=cat.position}} - {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} - {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} + {{d-button class="btn-default no-text" action="moveUp" actionParam=cat icon="arrow-up"}} + {{d-button class="btn-default no-text" action="moveDown" actionParam=cat icon="arrow-down"}} {{#if cat.hasBufferedChanges}} {{d-button class="no-text ok" action="commit" icon="check"}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs index b68ce331173..7db9379182b 100644 --- a/app/assets/javascripts/discourse/templates/preferences/account.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs @@ -3,7 +3,7 @@
    {{model.username}} {{#if model.can_edit_username}} - {{#link-to "preferences.username" class="btn btn-small btn-icon pad-left no-text"}} + {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{d-icon "pencil"}} {{/link-to}} {{/if}}
    @@ -37,7 +37,7 @@
    {{model.email}} {{#if model.can_edit_email}} - {{#link-to "preferences.email" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}} + {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}} {{/if}}
    @@ -45,7 +45,7 @@
    {{else}}
    - {{d-button action="checkEmail" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}} + {{d-button action="checkEmail" class="btn-default" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
    {{/if}} @@ -55,7 +55,7 @@
    - + {{d-icon "envelope"}} {{#if model.no_password}} {{i18n 'user.change_password.set_password'}} @@ -75,7 +75,7 @@ {{/if}} {{#if isCurrentUser}} - {{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}} + {{#link-to "preferences.second-factor" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{d-icon "pencil"}} {{/link-to}} {{/if}} @@ -90,7 +90,7 @@ {{/if}} {{#if isCurrentUser}} - {{#link-to "preferences.second-factor-backup" class="btn btn-small btn-icon pad-left no-text"}} + {{#link-to "preferences.second-factor-backup" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{d-icon "pencil"}} {{/link-to}} {{/if}} @@ -144,7 +144,7 @@
    {{! we want the "huge" version even though we're downsizing it in CSS }} {{bound-avatar model "huge"}} - {{d-button action="showAvatarSelector" actionParam=model class="pad-left" icon="pencil"}} + {{d-button action="showAvatarSelector" actionParam=model class="btn-default pad-left" icon="pencil"}}
    {{/unless}} diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index cdaf9169ae8..d266e2b9cd9 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -6,6 +6,6 @@

    {{i18n "queue.none"}}

    {{/each}} - {{d-button action="refresh" label="refresh" icon="refresh" disabled=model.refreshing id='refresh-queued'}} + {{d-button action="refresh" label="refresh" icon="refresh" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
    diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs index 60f2f48bcd4..36657de0dca 100644 --- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs +++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs @@ -43,7 +43,7 @@ - + {{model.savingStatus}} diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs index a4c0ec21de7..6c49ad8aafc 100644 --- a/app/assets/javascripts/discourse/templates/tag-groups.hbs +++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs @@ -7,7 +7,7 @@
  • {{tagGroup.name}}
    • {{/each}} - + {{outlet}} diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs index eba88d2dbbe..237917053b5 100644 --- a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs +++ b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs @@ -5,8 +5,8 @@ {{/if ~}} {{~#if bulkSelectEnabled}} - - + + {{/if ~}} {{/if ~}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 1ebdb92ac31..037a563527b 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -32,7 +32,7 @@ {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
    {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} - {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} + {{d-button action="cancelEditingTopic" class="btn-default btn-small cancel-edit" icon="times"}} {{#if canRemoveTopicFeaturedLink}} diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index fbbb9d1a660..b6173b63339 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -51,7 +51,7 @@ {{/if}} {{#if currentUser.staff}} -
  • {{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}
    • +
  • {{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}
    • {{/if}} {{plugin-outlet name="user-profile-controls" connectorTagName="li" @@ -60,11 +60,11 @@ {{#if canExpandProfile}}
  • {{#if collapsedInfo}} - + {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}} {{else}} - + {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs index 75899390d81..716a8530557 100644 --- a/app/assets/javascripts/discourse/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/templates/user/activity.hbs @@ -29,7 +29,7 @@ {{#if canDownloadPosts}}
    - {{d-button action="exportUserArchive" label="user.download_archive.button_text" icon="download"}} + {{d-button action="exportUserArchive" class="btn-default" label="user.download_archive.button_text" icon="download"}}
    {{/if}} {{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs index 2e1bbb33e57..85541a84a27 100644 --- a/app/assets/javascripts/discourse/templates/user/messages.hbs +++ b/app/assets/javascripts/discourse/templates/user/messages.hbs @@ -59,7 +59,7 @@
    {{#if showToggleBulkSelect}} - {{/if}} @@ -71,19 +71,19 @@ {{/if}} {{#if canArchive}} - {{/if}} {{#if canMoveToInbox}} - {{/if}} {{#if bulkSelectEnabled}} - {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index c732db3fbac..ede14b75b9c 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -31,7 +31,7 @@ {{#if model}} {{d-button title='user.dismiss_notifications_tooltip' - class='btn dismiss-notifications' + class='btn btn-default dismiss-notifications' action=(action "resetNew") label='user.dismiss_notifications' icon='check' diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 index 1a7182288e4..29732a34234 100644 --- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 @@ -22,6 +22,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { if (currentUser.staff) { contents.push({ icon: "list", + className: "btn-default", label: "admin.flags.moderation_history", action: "showModerationHistory" }); @@ -31,7 +32,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { const buttonAtts = { action: "togglePostType", icon: "shield", - className: "toggle-post-type" + className: "btn-default toggle-post-type" }; if (attrs.isModeratorAction) { @@ -47,7 +48,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { icon: "cog", label: "post.controls.rebake", action: "rebakePost", - className: "rebuild-html" + className: "btn-default rebuild-html" }); if (attrs.hidden) { @@ -55,7 +56,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { icon: "eye", label: "post.controls.unhide", action: "unhidePost", - className: "unhide-post" + className: "btn-default unhide-post" }); } } @@ -65,7 +66,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { icon: "user", label: "post.controls.change_owner", action: "changePostOwner", - className: "change-owner" + className: "btn-default change-owner" }); } @@ -75,7 +76,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { icon: "certificate", label: "post.controls.grant_badge", action: "grantBadge", - className: "grant-badge" + className: "btn-default grant-badge" }); } @@ -85,7 +86,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { label: `post.controls.${action}_post`, action: `${action}Post`, title: `post.controls.${action}_post_description`, - className: `${action}-post` + className: `btn-default ${action}-post` }); } @@ -95,14 +96,14 @@ export function buildManageButtons(attrs, currentUser, siteSettings) { action: "toggleWiki", label: "post.controls.unwiki", icon: "pencil-square-o", - className: "wiki wikied" + className: "btn-default wiki wikied" }); } else { contents.push({ action: "toggleWiki", label: "post.controls.wiki", icon: "pencil-square-o", - className: "wiki" + className: "btn-default wiki" }); } } diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 index e55f96b13a4..200ed332b2c 100644 --- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 +++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 @@ -157,7 +157,7 @@ export default createWidget("private-message-map", { this.attach("button", { action: "toggleEditing", label: "private_message_info.edit", - className: "btn add-remove-participant-btn" + className: "btn btn-default add-remove-participant-btn" }) ]; diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 index 4322771a23f..783b4f09ef5 100644 --- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 @@ -42,7 +42,8 @@ createWidget("topic-admin-menu-button", { result.push( this.attach("button", { className: - "toggle-admin-menu" + (attrs.fixed ? " show-topic-admin" : ""), + "btn-default toggle-admin-menu" + + (attrs.fixed ? " show-topic-admin" : ""), title: "topic_admin_menu", icon: "wrench", action: "showAdminMenu", @@ -132,6 +133,7 @@ export default createWidget("topic-admin-menu", { const buttons = []; buttons.push({ className: "topic-admin-multi-select", + buttonClass: "btn-default", action: "toggleMultiSelect", icon: "tasks", label: "actions.multi_select" @@ -153,6 +155,7 @@ export default createWidget("topic-admin-menu", { if (topic.get("deleted") && details.get("can_recover")) { buttons.push({ className: "topic-admin-recover", + buttonClass: "btn-default", action: "recoverTopic", icon: "undo", label: "actions.recover" @@ -162,6 +165,7 @@ export default createWidget("topic-admin-menu", { if (topic.get("closed")) { buttons.push({ className: "topic-admin-open", + buttonClass: "btn-default", action: "toggleClosed", icon: "unlock", label: "actions.open" @@ -169,6 +173,7 @@ export default createWidget("topic-admin-menu", { } else { buttons.push({ className: "topic-admin-close", + buttonClass: "btn-default", action: "toggleClosed", icon: "lock", label: "actions.close" @@ -177,6 +182,7 @@ export default createWidget("topic-admin-menu", { buttons.push({ className: "topic-admin-status-update", + buttonClass: "btn-default", action: "showTopicStatusUpdate", icon: "clock-o", label: "actions.timed_update" @@ -188,6 +194,7 @@ export default createWidget("topic-admin-menu", { if (!isPrivateMessage && (topic.get("visible") || featured)) { buttons.push({ className: "topic-admin-pin", + buttonClass: "btn-default", action: "showFeatureTopic", icon: "thumb-tack", label: featured ? "actions.unpin" : "actions.pin" @@ -197,6 +204,7 @@ export default createWidget("topic-admin-menu", { if (this.currentUser.admin) { buttons.push({ className: "topic-admin-change-timestamp", + buttonClass: "btn-default", action: "showChangeTimestamp", icon: "calendar", label: "change_timestamp.title" @@ -206,6 +214,7 @@ export default createWidget("topic-admin-menu", { if (this.currentUser.get("staff")) { buttons.push({ className: "topic-admin-reset-bump-date", + buttonClass: "btn-default", action: "resetBumpDate", icon: "anchor", label: "actions.reset_bump_date" @@ -215,6 +224,7 @@ export default createWidget("topic-admin-menu", { if (!isPrivateMessage) { buttons.push({ className: "topic-admin-archive", + buttonClass: "btn-default", action: "toggleArchived", icon: "folder", label: topic.get("archived") ? "actions.unarchive" : "actions.archive" @@ -224,6 +234,7 @@ export default createWidget("topic-admin-menu", { const visible = topic.get("visible"); buttons.push({ className: "topic-admin-visible", + buttonClass: "btn-default", action: "toggleVisibility", icon: visible ? "eye-slash" : "eye", label: visible ? "actions.invisible" : "actions.visible" @@ -232,6 +243,7 @@ export default createWidget("topic-admin-menu", { if (details.get("can_convert_topic")) { buttons.push({ className: "topic-admin-convert", + buttonClass: "btn-default", action: isPrivateMessage ? "convertToPublicTopic" : "convertToPrivateMessage", @@ -243,6 +255,7 @@ export default createWidget("topic-admin-menu", { if (this.currentUser.get("staff")) { buttons.push({ action: "showModerationHistory", + buttonClass: "btn-default", icon: "list", fullLabel: "admin.flags.moderation_history" }); diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index 5cfcee2363a..f73c7392ad4 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -337,7 +337,7 @@ createWidget("timeline-footer-controls", { if (topic.get("details.can_create_post")) { controls.push( this.attach("button", { - className: "create", + className: "btn-default create", icon: "reply", title: "topic.reply.help", action: "replyToPost" diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 index 12a37b3e156..1acccd3067c 100644 --- a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 +++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 @@ -4,7 +4,7 @@ import computed from "ember-addons/ember-computed-decorators"; export default SelectKitHeaderComponent.extend({ layoutName: "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header", - classNames: "dropdown-select-box-header", + classNames: "btn-default dropdown-select-box-header", tagName: "button", classNameBindings: ["btnClassName"], diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss index 3d1e28dcde0..389e2f394ae 100644 --- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss +++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss @@ -8,7 +8,6 @@ } .select-kit-row { - border-radius: 4px; margin-bottom: 5px; padding: 6px 3px; background: $primary-low; diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb index 7949a1b5ab3..4f08ba275ab 100644 --- a/app/views/exceptions/not_found.html.erb +++ b/app/views/exceptions/not_found.html.erb @@ -11,7 +11,7 @@ <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
    <% end %> - " class="btn"><%= t 'page_not_found.see_more' %>… + " class="btn btn-default"><%= t 'page_not_found.see_more' %>…

    • <%= t 'page_not_found.recent_topics' %>

    @@ -20,7 +20,7 @@ <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
    <% end %> - " class="btn"><%= t 'page_not_found.see_more' %>… + " class="btn btn-default"><%= t 'page_not_found.see_more' %>… <% end %> diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs index 9b835945a6a..737e797809e 100644 --- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs +++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs @@ -112,7 +112,7 @@
    {{#if validDate}} - {{d-button class="btn" + {{d-button class="btn btn-default" action="save" label="discourse_local_dates.create.form.insert"}} {{/if}} @@ -122,7 +122,7 @@ {{d-button - class="advanced-mode-btn" + class="btn-default advanced-mode-btn" action=(action "advancedMode") icon="cog" label=toggleModeBtnLabel}} diff --git a/vendor/assets/javascripts/bootbox.js b/vendor/assets/javascripts/bootbox.js index 275ef8f4f5f..e84a733caef 100644 --- a/vendor/assets/javascripts/bootbox.js +++ b/vendor/assets/javascripts/bootbox.js @@ -288,7 +288,7 @@ var bootbox = window.bootbox || (function(document, $) { while (i--) { var label = null, href = null, - _class = null, + _class = 'btn-default', icon = '', callback = null;