github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-02 14:01:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: remap all core icons for fontawesome 6 upgrade (#28715)

Browse Source 
Followup to 7d8974d02f

Co-authored-by: David Taylor <david@taylorhq.com>
This commit is contained in:
Kris 2024-09-13 11:50:52 -04:00 committed by GitHub
parent 9afc9a6e28
commit a914d3230b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
410 changed files with 840 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs
View File

@ -56,7 +56,7 @@ export default class AdminBackupsActions extends Component {
@action={{routeAction "cancelOperation"}} @action={{routeAction "cancelOperation"}}
@title="admin.backups.operations.cancel.title" @title="admin.backups.operations.cancel.title"
@label="admin.backups.operations.cancel.label" @label="admin.backups.operations.cancel.label"
@icon="times" @icon="xmark"
class="admin-backups__cancel" class="admin-backups__cancel"
/> />
{{else}} {{else}}
@ -74,7 +74,7 @@ export default class AdminBackupsActions extends Component {
@action={{routeAction "rollback"}} @action={{routeAction "rollback"}}
@label="admin.backups.operations.rollback.label" @label="admin.backups.operations.rollback.label"
@title="admin.backups.operations.rollback.title" @title="admin.backups.operations.rollback.title"
@icon="ambulance" @icon="truck-medical"
@disabled={{this.rollbackDisabled}} @disabled={{this.rollbackDisabled}}
class="admin-backups__rollback" class="admin-backups__rollback"
/> />

2
app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
View File

@ -21,6 +21,6 @@
/> />
<a href {{on "click" this.edit}}>{{i18n "cancel"}}</a> <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
{{else}} {{else}}
<DButton class="btn-default" @action={{this.edit}} @icon="pencil-alt" /> <DButton class="btn-default" @action={{this.edit}} @icon="pencil" />
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/admin/addon/components/admin-flag-item.gjs
View File

@ -148,7 +148,7 @@ export default class AdminFlagItem extends Component {
<DMenu <DMenu
@identifier="flag-menu" @identifier="flag-menu"
@title={{i18n "admin.config_areas.flags.more_options.title"}} @title={{i18n "admin.config_areas.flags.more_options.title"}}
@icon="ellipsis-v" @icon="ellipsis-vertical"
@onRegisterApi={{this.onRegisterApi}} @onRegisterApi={{this.onRegisterApi}}
> >
<:content> <:content>
@ -177,7 +177,7 @@ export default class AdminFlagItem extends Component {
<dropdown.item> <dropdown.item>
<DButton <DButton
@label="admin.config_areas.flags.delete" @label="admin.config_areas.flags.delete"
@icon="trash-alt" @icon="trash-can"
class="btn-transparent admin-flag-item__delete" class="btn-transparent admin-flag-item__delete"
@action={{this.delete}} @action={{this.delete}}
@disabled={{not this.canEdit}} @disabled={{not this.canEdit}}

2
app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
View File

@ -182,7 +182,7 @@ export default class AdminFlagsForm extends Component {
</checkboxGroup.Field> </checkboxGroup.Field>
</form.CheckboxGroup> </form.CheckboxGroup>
<form.Alert @icon="info-circle"> <form.Alert @icon="circle-info">
{{i18n "admin.config_areas.flags.form.alert"}} {{i18n "admin.config_areas.flags.form.alert"}}
</form.Alert> </form.Alert>

2
app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
View File

@ -97,7 +97,7 @@ export default class AdminPluginsListItem extends Component {
target="_blank" target="_blank"
> >
{{i18n "admin.plugins.learn_more"}} {{i18n "admin.plugins.learn_more"}}
{{icon "external-link-alt"}} {{icon "up-right-from-square"}}
</a> </a>
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
View File

@ -1,7 +1,7 @@
{{#if this.showBackupStats}} {{#if this.showBackupStats}}
<div class="backups"> <div class="backups">
<h3 class="storage-stats-title"> <h3 class="storage-stats-title">
<a href={{get-url "/admin/backups"}}>{{d-icon "archive"}} <a href={{get-url "/admin/backups"}}>{{d-icon "box-archive"}}
{{i18n "admin.dashboard.backups"}}</a> {{i18n "admin.dashboard.backups"}}</a>
</h3> </h3>
<p> <p>

12
app/assets/javascripts/admin/addon/components/admin-report.hbs
View File

@ -28,7 +28,7 @@
@interactive={{this.model.description_link.length}} @interactive={{this.model.description_link.length}}
> >
<:trigger> <:trigger>
{{d-icon "question-circle"}} {{d-icon "circle-question"}}
</:trigger> </:trigger>
<:content> <:content>
{{#if this.model.description_link}} {{#if this.model.description_link}}
@ -78,21 +78,21 @@
{{#if this.showError}} {{#if this.showError}}
{{#if this.showTimeoutError}} {{#if this.showTimeoutError}}
<div class="alert alert-error report-alert timeout"> <div class="alert alert-error report-alert timeout">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
<span>{{i18n "admin.dashboard.timeout_error"}}</span> <span>{{i18n "admin.dashboard.timeout_error"}}</span>
</div> </div>
{{/if}} {{/if}}
{{#if this.showExceptionError}} {{#if this.showExceptionError}}
<div class="alert alert-error report-alert exception"> <div class="alert alert-error report-alert exception">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
<span>{{i18n "admin.dashboard.exception_error"}}</span> <span>{{i18n "admin.dashboard.exception_error"}}</span>
</div> </div>
{{/if}} {{/if}}
{{#if this.showNotFoundError}} {{#if this.showNotFoundError}}
<div class="alert alert-error report-alert not-found"> <div class="alert alert-error report-alert not-found">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
<span>{{i18n "admin.dashboard.not_found_error"}}</span> <span>{{i18n "admin.dashboard.not_found_error"}}</span>
</div> </div>
{{/if}} {{/if}}
@ -115,7 +115,7 @@
{{else}} {{else}}
{{#if this.rateLimitationString}} {{#if this.rateLimitationString}}
<div class="alert alert-error report-alert rate-limited"> <div class="alert alert-error report-alert rate-limited">
{{d-icon "thermometer-three-quarters"}} {{d-icon "temperature-three-quarters"}}
<span>{{this.rateLimitationString}}</span> <span>{{this.rateLimitationString}}</span>
</div> </div>
{{else}} {{else}}
@ -228,7 +228,7 @@
<DButton <DButton
@action={{this.refreshReport}} @action={{this.refreshReport}}
@label="admin.dashboard.reports.refresh_report" @label="admin.dashboard.reports.refresh_report"
@icon="sync" @icon="arrows-rotate"
class="refresh-report-btn btn-primary" class="refresh-report-btn btn-primary"
/> />
</div> </div>

2
app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs
View File

@ -65,7 +65,7 @@ export default class AdminSiteSettingsFilterControls extends Component {
{{#if @showMenu}} {{#if @showMenu}}
<DButton <DButton
@action={{this.toggleMenu}} @action={{this.toggleMenu}}
@icon={{if this.isMenuOpen "times" "bars"}} @icon={{if this.isMenuOpen "xmark" "bars"}}
class="menu-toggle" class="menu-toggle"
/> />
{{/if}} {{/if}}

10
app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
View File

@ -10,7 +10,7 @@
title={{this.field.title}} title={{this.field.title}}
class={{if target.edited "edited" "blank"}} class={{if target.edited "edited" "blank"}}
> >
{{#if target.error}}{{d-icon "exclamation-triangle"}}{{/if}} {{#if target.error}}{{d-icon "triangle-exclamation"}}{{/if}}
{{#if target.icon}}{{d-icon target.icon}}{{/if}} {{#if target.icon}}{{d-icon target.icon}}{{/if}}
{{i18n (concat "admin.customize.theme." target.name)}} {{i18n (concat "admin.customize.theme." target.name)}}
</LinkTo> </LinkTo>
@ -30,9 +30,7 @@
}} }}
class="no-text" class="no-text"
> >
{{d-icon {{d-icon (if this.showAdvanced "angles-left" "angles-right")}}
(if this.showAdvanced "angle-double-left" "angle-double-right")
}}
</a> </a>
</li> </li>
{{/if}} {{/if}}
@ -66,7 +64,7 @@
title={{field.title}} title={{field.title}}
class={{if field.edited "edited" "blank"}} class={{if field.edited "edited" "blank"}}
> >
{{#if field.error}}{{d-icon "exclamation-triangle"}}{{/if}} {{#if field.error}}{{d-icon "triangle-exclamation"}}{{/if}}
{{#if field.icon}}{{d-icon field.icon}}{{/if}} {{#if field.icon}}{{d-icon field.icon}}{{/if}}
{{field.translatedName}} {{field.translatedName}}
</LinkTo> </LinkTo>
@ -89,7 +87,7 @@
/> />
<DButton <DButton
@action={{this.cancelAddField}} @action={{this.cancelAddField}}
@icon="times" @icon="xmark"
class="cancel" class="cancel"
/> />
{{else}} {{else}}

6
app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
View File

@ -114,7 +114,7 @@
/> />
<DButton <DButton
@action={{this.cancel}} @action={{this.cancel}}
@icon="times" @icon="xmark"
@label="admin.user_fields.cancel" @label="admin.user_fields.cancel"
class="btn-danger cancel" class="btn-danger cancel"
/> />
@ -132,13 +132,13 @@
<div class="form-element controls"> <div class="form-element controls">
<DButton <DButton
@action={{this.edit}} @action={{this.edit}}
@icon="pencil-alt" @icon="pencil"
@label="admin.user_fields.edit" @label="admin.user_fields.edit"
class="btn-default edit" class="btn-default edit"
/> />
<DButton <DButton
@action={{fn this.destroyAction this.userField}} @action={{fn this.destroyAction this.userField}}
@icon="far-trash-alt" @icon="trash-can"
@label="admin.user_fields.delete" @label="admin.user_fields.delete"
class="btn-danger cancel" class="btn-danger cancel"
/> />

2
app/assets/javascripts/admin/addon/components/admin-watched-word.gjs
View File

@ -30,7 +30,7 @@ export default class AdminWatchedWord extends Component {
<div class="watched-word"> <div class="watched-word">
<DButton <DButton
@action={{this.deleteWord}} @action={{this.deleteWord}}
@icon="times" @icon="xmark"
class="btn-transparent delete-word-record" class="btn-transparent delete-word-record"
/> />

2
app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs
View File

@ -30,7 +30,7 @@ export default class DashboardPeriodSelector extends Component {
@fullDay={{false}} @fullDay={{false}}
/> />
<DButton <DButton
@icon="cog" @icon="gear"
@action={{this.openCustomDateRangeModal}} @action={{this.openCustomDateRangeModal}}
@title="admin.dashboard.custom_date_range" @title="admin.dashboard.custom_date_range"
class="custom-date-range-button" class="custom-date-range-button"

4
app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
View File

@ -20,7 +20,7 @@
problem.priority problem.priority
}} }}
> >
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{html-safe problem.message}} {{html-safe problem.message}}
</li> </li>
{{/each}} {{/each}}
@ -45,7 +45,7 @@
<p class="actions"> <p class="actions">
<DButton <DButton
@action={{this.refreshProblems}} @action={{this.refreshProblems}}
@icon="sync" @icon="arrows-rotate"
@label="admin.dashboard.refresh_problems" @label="admin.dashboard.refresh_problems"
class="btn-default" class="btn-default"
/> />

6
app/assets/javascripts/admin/addon/components/embeddable-host.hbs
View File

@ -53,7 +53,7 @@
class="btn-primary" class="btn-primary"
/> />
<DButton <DButton
@icon="times" @icon="xmark"
@action={{this.cancel}} @action={{this.cancel}}
@disabled={{this.host.isSaving}} @disabled={{this.host.isSaving}}
class="btn-danger" class="btn-danger"
@ -81,7 +81,7 @@
{{this.user}} {{this.user}}
</td> </td>
<td class="controls"> <td class="controls">
<DButton @icon="pencil-alt" @action={{this.edit}} /> <DButton @icon="pencil" @action={{this.edit}} />
<DButton @icon="far-trash-alt" @action={{this.delete}} class="btn-danger" /> <DButton @icon="trash-can" @action={{this.delete}} class="btn-danger" />
</td> </td>
{{/if}} {{/if}}

2
app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
View File

@ -4,7 +4,7 @@
<li class="value" data-index={{index}}> <li class="value" data-index={{index}}>
<DButton <DButton
@action={{fn this.removeValue data}} @action={{fn this.removeValue data}}
@icon="times" @icon="xmark"
@disabled={{not data.isEditable}} @disabled={{not data.isEditable}}
class="remove-value-btn btn-small" class="remove-value-btn btn-small"
/> />

6
app/assets/javascripts/admin/addon/components/form-template/form.hbs
View File

@ -25,7 +25,7 @@
{{/each}} {{/each}}
<DButton <DButton
@label="admin.form_templates.validations_modal.button_title" @label="admin.form_templates.validations_modal.button_title"
@icon="check-circle" @icon="circle-check"
@action={{this.showValidationOptionsModal}} @action={{this.showValidationOptionsModal}}
class="btn-flat btn-icon-text form-templates__validations-modal-button" class="btn-flat btn-icon-text form-templates__validations-modal-button"
/> />
@ -58,14 +58,14 @@
<DButton <DButton
@label="admin.form_templates.new_template_form.cancel" @label="admin.form_templates.new_template_form.cancel"
@icon="times" @icon="xmark"
@action={{this.onCancel}} @action={{this.onCancel}}
/> />
{{#if this.isEditing}} {{#if this.isEditing}}
<DButton <DButton
@label="admin.form_templates.view_template.delete" @label="admin.form_templates.view_template.delete"
@icon="trash-alt" @icon="trash-can"
@action={{this.onDelete}} @action={{this.onDelete}}
class="btn-danger" class="btn-danger"
/> />

6
app/assets/javascripts/admin/addon/components/form-template/form.js
View File

@ -22,7 +22,7 @@ export default class FormTemplateForm extends Component {
quickInsertFields = [ quickInsertFields = [
{ {
type: "checkbox", type: "checkbox",
icon: "check-square", icon: "square-check",
}, },
{ {
type: "input", type: "input",
@ -34,11 +34,11 @@ export default class FormTemplateForm extends Component {
}, },
{ {
type: "dropdown", type: "dropdown",
icon: "chevron-circle-down", icon: "circle-chevron-down",
}, },
{ {
type: "upload", type: "upload",
icon: "cloud-upload-alt", icon: "cloud-arrow-up",
}, },
{ {
type: "multiselect", type: "multiselect",

4
app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
View File

@ -14,13 +14,13 @@
/> />
<DButton <DButton
@title="admin.form_templates.list_table.actions.edit" @title="admin.form_templates.list_table.actions.edit"
@icon="pencil-alt" @icon="pencil"
@action={{this.editTemplate}} @action={{this.editTemplate}}
class="btn-edit-template" class="btn-edit-template"
/> />
<DButton <DButton
@title="admin.form_templates.list_table.actions.delete" @title="admin.form_templates.list_table.actions.delete"
@icon="far-trash-alt" @icon="trash-can"
@action={{this.deleteTemplate}} @action={{this.deleteTemplate}}
class="btn-danger btn-delete-template" class="btn-danger btn-delete-template"
/> />

2
app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
View File

@ -10,7 +10,7 @@
/> />
<DButton <DButton
@action={{this.cancel}} @action={{this.cancel}}
@icon="times" @icon="xmark"
class="btn-small cancel-edit" class="btn-small cancel-edit"
/> />
{{/if}} {{/if}}

4
app/assets/javascripts/admin/addon/components/ip-lookup.hbs
View File

@ -9,7 +9,7 @@
{{#if this.show}} {{#if this.show}}
<div class="location-box"> <div class="location-box">
<a href class="close pull-right" {{on "click" this.hide}}>{{d-icon <a href class="close pull-right" {{on "click" this.hide}}>{{d-icon
"times" "xmark"
}}</a> }}</a>
{{#if this.copied}} {{#if this.copied}}
<DButton <DButton
@ -58,7 +58,7 @@
{{#if this.other_accounts.length}} {{#if this.other_accounts.length}}
<DButton <DButton
@action={{this.deleteOtherAccounts}} @action={{this.deleteOtherAccounts}}
@icon="exclamation-triangle" @icon="triangle-exclamation"
@translatedLabel={{i18n @translatedLabel={{i18n
"ip_lookup.delete_other_accounts" "ip_lookup.delete_other_accounts"
count=this.otherAccountsToDelete count=this.otherAccountsToDelete

2
app/assets/javascripts/admin/addon/components/modal/badge-preview.hbs
View File

@ -25,7 +25,7 @@
{{#if this.countWarning}} {{#if this.countWarning}}
<div class="count-warning"> <div class="count-warning">
<p class="heading"> <p class="heading">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{i18n "admin.badges.preview.bad_count_warning.header"}} {{i18n "admin.badges.preview.bad_count_warning.header"}}
</p> </p>
<p class="body"> <p class="body">

2
app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs
View File

@ -16,7 +16,7 @@
<DButton <DButton
@action={{this.updateDateRange}} @action={{this.updateDateRange}}
@label="admin.dashboard.reports.refresh_report" @label="admin.dashboard.reports.refresh_report"
@icon="sync" @icon="arrows-rotate"
/> />
</:footer> </:footer>
</DModal> </DModal>

2
app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
View File

@ -21,7 +21,7 @@
<DButton <DButton
class="btn-danger" class="btn-danger"
@action={{@model.deleteAllPosts}} @action={{@model.deleteAllPosts}}
@icon="trash-alt" @icon="trash-can"
@disabled={{this.deleteDisabled}} @disabled={{this.deleteDisabled}}
@translatedLabel={{i18n @translatedLabel={{i18n
"admin.user.delete_posts.confirmation.delete" "admin.user.delete_posts.confirmation.delete"

4
app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.hbs
View File

@ -22,7 +22,7 @@
<DButton <DButton
@action={{fn (mut wc.editing) true}} @action={{fn (mut wc.editing) true}}
@disabled={{wc.system}} @disabled={{wc.system}}
@icon="pencil-alt" @icon="pencil"
/> />
{{/if}} {{/if}}
<DButton @action={{fn this.up wc}} @icon="chevron-up" /> <DButton @action={{fn this.up wc}} @icon="chevron-up" />
@ -30,7 +30,7 @@
<DButton <DButton
@action={{fn this.delete wc}} @action={{fn this.delete wc}}
@disabled={{wc.system}} @disabled={{wc.system}}
@icon="times" @icon="xmark"
/> />
</div> </div>
</li> </li>

2
app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs
View File

@ -21,7 +21,7 @@
<DButton <DButton
class="btn-danger" class="btn-danger"
@action={{fn @model.merge @model.targetUsername}} @action={{fn @model.merge @model.targetUsername}}
@icon="trash-alt" @icon="trash-can"
@disabled={{this.mergeDisabled}} @disabled={{this.mergeDisabled}}
@translatedLabel={{i18n @translatedLabel={{i18n
"admin.user.merge.confirmation.transfer_and_delete" "admin.user.merge.confirmation.transfer_and_delete"

2
app/assets/javascripts/admin/addon/components/modal/merge-users-prompt.hbs
View File

@ -24,7 +24,7 @@
<DButton <DButton
class="btn-primary" class="btn-primary"
@action={{fn @model.showMergeConfirmation (get this.targetUsername "0")}} @action={{fn @model.showMergeConfirmation (get this.targetUsername "0")}}
@icon="trash-alt" @icon="trash-can"
@disabled={{this.mergeDisabled}} @disabled={{this.mergeDisabled}}
@translatedLabel={{i18n @translatedLabel={{i18n
"admin.user.merge.confirmation.transfer_and_delete" "admin.user.merge.confirmation.transfer_and_delete"

2
app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.hbs
View File

@ -9,7 +9,7 @@
<a href class="selectable-avatar" {{on "click" (fn this.remove image)}}> <a href class="selectable-avatar" {{on "click" (fn this.remove image)}}>
{{bound-avatar-template image "huge"}} {{bound-avatar-template image "huge"}}
<span class="selectable-avatar__remove">{{d-icon <span class="selectable-avatar__remove">{{d-icon
"times-circle" "circle-xmark"
}}</span> }}</span>
</a> </a>
{{else}} {{else}}

2
app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs
View File

@ -308,7 +308,7 @@ export default class SchemaThemeSettingNewEditor extends Component {
{{#if (gt this.fields.length 0)}} {{#if (gt this.fields.length 0)}}
<DButton <DButton
@action={{this.removeItem}} @action={{this.removeItem}}
@icon="trash-alt" @icon="trash-can"
class="btn-danger schema-theme-setting-editor__remove-btn" class="btn-danger schema-theme-setting-editor__remove-btn"
/> />
{{/if}} {{/if}}

2
app/assets/javascripts/admin/addon/components/secret-value-list.hbs
View File

@ -4,7 +4,7 @@
<div class="value" data-index={{index}}> <div class="value" data-index={{index}}>
<DButton <DButton
@action={{fn this.removeValue value}} @action={{fn this.removeValue value}}
@icon="times" @icon="xmark"
class="remove-value-btn btn-small" class="remove-value-btn btn-small"
/> />
<Input <Input

2
app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
View File

@ -1,4 +1,4 @@
<div class="validation-error {{unless this.message 'hidden'}}"> <div class="validation-error {{unless this.message 'hidden'}}">
{{d-icon "times"}} {{d-icon "xmark"}}
{{this.message}} {{this.message}}
</div> </div>

2
app/assets/javascripts/admin/addon/components/simple-list.hbs
View File

@ -4,7 +4,7 @@
<div data-index={{index}} class="value"> <div data-index={{index}} class="value">
<DButton <DButton
@action={{fn this.removeValue value}} @action={{fn this.removeValue value}}
@icon="times" @icon="xmark"
class="remove-value-btn btn-small" class="remove-value-btn btn-small"
/> />

6
app/assets/javascripts/admin/addon/components/site-setting.hbs
View File

@ -9,7 +9,7 @@
title={{i18n "admin.settings.history"}} title={{i18n "admin.settings.history"}}
> >
<span class="history-icon"> <span class="history-icon">
{{d-icon "history"}} {{d-icon "clock-rotate-left"}}
</span> </span>
</LinkTo> </LinkTo>
{{/if}} {{/if}}
@ -62,7 +62,7 @@
/> />
<DButton <DButton
@action={{this.cancel}} @action={{this.cancel}}
@icon="times" @icon="xmark"
class="cancel setting-controls__cancel" class="cancel setting-controls__cancel"
/> />
</div> </div>
@ -78,7 +78,7 @@
<DButton <DButton
class="btn-default undo setting-controls__undo" class="btn-default undo setting-controls__undo"
@action={{this.resetDefault}} @action={{this.resetDefault}}
@icon="undo" @icon="arrow-rotate-left"
@label="admin.settings.reset" @label="admin.settings.reset"
/> />
{{/if}} {{/if}}

2
app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
View File

@ -8,7 +8,7 @@
{{#each this.errors as |error|}} {{#each this.errors as |error|}}
<div class="validation-error"> <div class="validation-error">
{{d-icon "times"}} {{d-icon "xmark"}}
<b>{{error.setting}}</b>: <b>{{error.setting}}</b>:
{{error.errorMessage}} {{error.errorMessage}}
</div> </div>

4
app/assets/javascripts/admin/addon/components/themes-list-item.gjs
View File

@ -117,14 +117,14 @@ export default class ThemesListItem extends Component {
{{/if}} {{/if}}
{{#if @theme.isPendingUpdates}} {{#if @theme.isPendingUpdates}}
{{icon {{icon
"sync" "arrows-rotate"
title="admin.customize.theme.updates_available_tooltip" title="admin.customize.theme.updates_available_tooltip"
class="light-grey-icon" class="light-grey-icon"
}} }}
{{/if}} {{/if}}
{{#if @theme.isBroken}} {{#if @theme.isBroken}}
{{icon {{icon
"exclamation-circle" "circle-exclamation"
class="broken-indicator" class="broken-indicator"
title="admin.customize.theme.broken_theme_tooltip" title="admin.customize.theme.broken_theme_tooltip"
}} }}

4
app/assets/javascripts/admin/addon/components/themes-list.hbs
View File

@ -25,7 +25,7 @@
@type="search" @type="search"
@value={{mut this.searchTerm}} @value={{mut this.searchTerm}}
/> />
{{d-icon "search"}} {{d-icon "magnifying-glass"}}
</div> </div>
<div class="themes-list-filter"> <div class="themes-list-filter">
<div class="themes-list-filter__label"> <div class="themes-list-filter__label">
@ -101,7 +101,7 @@
@action={{this.deleteConfirmation}} @action={{this.deleteConfirmation}}
@disabled={{eq this.selectedCount 0}} @disabled={{eq this.selectedCount 0}}
> >
{{d-icon "trash-alt"}} {{d-icon "trash-can"}}
Delete Delete
</DButton> </DButton>
{{/if}} {{/if}}

2
app/assets/javascripts/admin/addon/components/value-list.hbs
View File

@ -4,7 +4,7 @@
<div data-index={{index}} class="value"> <div data-index={{index}} class="value">
<DButton <DButton
@action={{fn this.removeValue value}} @action={{fn this.removeValue value}}
@icon="times" @icon="xmark"
class="remove-value-btn btn-small" class="remove-value-btn btn-small"
/> />

10
app/assets/javascripts/admin/addon/components/version-checks.hbs
View File

@ -41,7 +41,7 @@
<div class="version-status"> <div class="version-status">
<div class="face"> <div class="face">
<span class="icon critical-updates-available"> <span class="icon critical-updates-available">
{{d-icon "far-frown"}} {{d-icon "far-face-frown"}}
</span> </span>
</div> </div>
<div class="version-notes"> <div class="version-notes">
@ -65,11 +65,11 @@
<div class="face"> <div class="face">
{{#if this.versionCheck.version_check_pending}} {{#if this.versionCheck.version_check_pending}}
<span class="icon up-to-date"> <span class="icon up-to-date">
{{d-icon "far-smile"}} {{d-icon "far-face-smile"}}
</span> </span>
{{else}} {{else}}
<span class="icon critical-updates-available"> <span class="icon critical-updates-available">
{{d-icon "far-frown"}} {{d-icon "far-face-frown"}}
</span> </span>
{{/if}} {{/if}}
</div> </div>
@ -96,7 +96,7 @@
<div class="face"> <div class="face">
{{#if this.versionCheck.upToDate}} {{#if this.versionCheck.upToDate}}
<span class="icon up-to-date"> <span class="icon up-to-date">
{{d-icon "far-smile"}} {{d-icon "far-face-smile"}}
</span> </span>
{{else}} {{else}}
<span <span
@ -110,7 +110,7 @@
{{#if this.versionCheck.behindByOneVersion}} {{#if this.versionCheck.behindByOneVersion}}
{{d-icon "far-meh"}} {{d-icon "far-meh"}}
{{else}} {{else}}
{{d-icon "far-frown"}} {{d-icon "far-face-frown"}}
{{/if}} {{/if}}
</span> </span>
{{/if}} {{/if}}

4
app/assets/javascripts/admin/addon/components/webhook-event.hbs
View File

@ -1,7 +1,7 @@
<li> <li>
<div class="col first status"> <div class="col first status">
{{#if @event.redelivering}} {{#if @event.redelivering}}
{{d-icon "sync"}} {{d-icon "arrows-rotate"}}
{{else}} {{else}}
<span class={{this.statusColorClasses}}>{{@event.status}}</span> <span class={{this.statusColorClasses}}>{{@event.status}}</span>
{{/if}} {{/if}}
@ -25,7 +25,7 @@
@label="admin.web_hooks.events.response" @label="admin.web_hooks.events.response"
/> />
<DButton <DButton
@icon="sync" @icon="arrows-rotate"
@action={{this.redeliver}} @action={{this.redeliver}}
@label="admin.web_hooks.events.redeliver" @label="admin.web_hooks.events.redeliver"
/> />

8
app/assets/javascripts/admin/addon/components/webhook-event.js
View File

@ -42,14 +42,14 @@ export default class WebhookEvent extends Component {
get expandRequestIcon() { get expandRequestIcon() {
return this.expandDetails === this.expandDetailsRequestKey return this.expandDetails === this.expandDetailsRequestKey
? "ellipsis-h" ? "ellipsis"
: "ellipsis-v"; : "ellipsis-vertical";
} }
get expandResponseIcon() { get expandResponseIcon() {
return this.expandDetails === this.expandDetailsResponseKey return this.expandDetails === this.expandDetailsResponseKey
? "ellipsis-h" ? "ellipsis"
: "ellipsis-v"; : "ellipsis-vertical";
} }
@action @action

2
app/assets/javascripts/admin/addon/components/webhook-events.hbs
View File

@ -14,7 +14,7 @@
/> />
<DButton <DButton
@icon="sync" @icon="arrows-rotate"
@label="admin.web_hooks.events.redeliver_failed" @label="admin.web_hooks.events.redeliver_failed"
@action={{this.redeliverFailed}} @action={{this.redeliverFailed}}
@disabled={{not this.redeliverEnabled}} @disabled={{not this.redeliverEnabled}}

2
app/assets/javascripts/admin/addon/components/webhook-status.gjs
View File

@ -3,7 +3,7 @@ import icon from "discourse-common/helpers/d-icon";
import I18n from "discourse-i18n"; import I18n from "discourse-i18n";
export default class WebhookStatus extends Component { export default class WebhookStatus extends Component {
iconNames = ["far-circle", "times-circle", "circle", "circle"]; iconNames = ["far-circle", "circle-xmark", "circle", "circle"];
iconClasses = ["text-muted", "text-danger", "text-successful", "text-muted"]; iconClasses = ["text-muted", "text-danger", "text-successful", "text-muted"];
get status() { get status() {

4
app/assets/javascripts/admin/addon/controllers/admin-user-index.js
View File

@ -350,7 +350,7 @@ export default class AdminUserIndexController extends Controller.extend(
class: "delete-user-modal", class: "delete-user-modal",
buttons: [ buttons: [
{ {
icon: "exclamation-triangle", icon: "triangle-exclamation",
label: I18n.t("admin.user.anonymize_yes"), label: I18n.t("admin.user.anonymize_yes"),
class: "btn-danger", class: "btn-danger",
action: () => performAnonymize(), action: () => performAnonymize(),
@ -425,7 +425,7 @@ export default class AdminUserIndexController extends Controller.extend(
}, },
}, },
{ {
icon: "exclamation-triangle", icon: "triangle-exclamation",
label: I18n.t("admin.user.delete_and_block"), label: I18n.t("admin.user.delete_and_block"),
class: "btn-danger", class: "btn-danger",
action: () => { action: () => {

2
app/assets/javascripts/admin/addon/helpers/check-icon.js
View File

@ -5,6 +5,6 @@ import { renderIcon } from "discourse-common/lib/icon-library";
registerRawHelper("check-icon", checkIcon); registerRawHelper("check-icon", checkIcon);
export default function checkIcon(value) { export default function checkIcon(value) {
let icon = value ? "check" : "times"; let icon = value ? "check" : "xmark";
return htmlSafe(renderIcon("string", icon)); return htmlSafe(renderIcon("string", icon));
} }

2
app/assets/javascripts/admin/addon/helpers/disposition-icon.js
View File

@ -11,7 +11,7 @@ export default class DispositionIcon extends Helper {
let title = "admin.flags.dispositions." + disposition; let title = "admin.flags.dispositions." + disposition;
switch (disposition) { switch (disposition) {
case "deferred": { case "deferred": {
icon = "external-link-alt"; icon = "up-right-from-square";
break; break;
} }
case "agreed": { case "agreed": {

4
app/assets/javascripts/admin/addon/mixins/setting-component.js
View File

@ -199,7 +199,7 @@ export default Mixin.create({
}); });
}, },
label: "admin.site_settings.json_schema.edit", label: "admin.site_settings.json_schema.edit",
icon: "pencil-alt", icon: "pencil",
}; };
} else if (setting.objects_schema) { } else if (setting.objects_schema) {
return { return {
@ -210,7 +210,7 @@ export default Mixin.create({
); );
}, },
label: "admin.customize.theme.edit_objects_theme_setting", label: "admin.customize.theme.edit_objects_theme_setting",
icon: "pencil-alt", icon: "pencil",
}; };
} }
}), }),

4
app/assets/javascripts/admin/addon/models/report.js
View File

@ -692,9 +692,9 @@ export default class Report extends EmberObject {
case "trending-down": case "trending-down":
return higherIsBetter ? "angle-down" : "angle-up"; return higherIsBetter ? "angle-down" : "angle-up";
case "high-trending-up": case "high-trending-up":
return higherIsBetter ? "angle-double-up" : "angle-double-down"; return higherIsBetter ? "angles-up" : "angles-down";
case "high-trending-down": case "high-trending-down":
return higherIsBetter ? "angle-double-down" : "angle-double-up"; return higherIsBetter ? "angles-down" : "angles-up";
default: default:
return "minus"; return "minus";
} }

8
app/assets/javascripts/admin/addon/models/theme.js
View File

@ -37,8 +37,8 @@ class Theme extends RestModel {
return [ return [
{ id: 0, name: "common" }, { id: 0, name: "common" },
{ id: 1, name: "desktop", icon: "desktop" }, { id: 1, name: "desktop", icon: "desktop" },
{ id: 2, name: "mobile", icon: "mobile-alt" }, { id: 2, name: "mobile", icon: "mobile-screen-button" },
{ id: 3, name: "settings", icon: "cog", advanced: true }, { id: 3, name: "settings", icon: "gear", advanced: true },
{ {
id: 4, id: 4,
name: "translations", name: "translations",
@ -49,7 +49,7 @@ class Theme extends RestModel {
{ {
id: 5, id: 5,
name: "extra_scss", name: "extra_scss",
icon: "paint-brush", icon: "paintbrush",
advanced: true, advanced: true,
customNames: true, customNames: true,
}, },
@ -124,7 +124,7 @@ class Theme extends RestModel {
} }
if (fieldName.indexOf("_tag") > 0) { if (fieldName.indexOf("_tag") > 0) {
field.icon = "far-file-alt"; field.icon = "far-file-lines";
} }
return field; return field;

2
app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
View File

@ -15,7 +15,7 @@ const externalResources = [
{ {
key: "admin.customize.theme.browse_themes", key: "admin.customize.theme.browse_themes",
link: "https://meta.discourse.org/c/theme", link: "https://meta.discourse.org/c/theme",
icon: "paint-brush", icon: "paintbrush",
}, },
]; ];

2
app/assets/javascripts/admin/addon/services/admin-tools.js
View File

@ -90,7 +90,7 @@ export default class AdminToolsService extends Service {
message, message,
class: "flagging-delete-spammer", class: "flagging-delete-spammer",
confirmButtonLabel: "flagging.yes_delete_spammer", confirmButtonLabel: "flagging.yes_delete_spammer",
confirmButtonIcon: "exclamation-triangle", confirmButtonIcon: "triangle-exclamation",
didConfirm: () => { didConfirm: () => {
return ajax(`/admin/users/${userId}.json`, { return ajax(`/admin/users/${userId}.json`, {
type: "DELETE", type: "DELETE",

2
app/assets/javascripts/admin/addon/templates/admin-badges.hbs
View File

@ -31,7 +31,7 @@
@action={{routeAction "editGroupings"}} @action={{routeAction "editGroupings"}}
@title="admin.badges.group_settings" @title="admin.badges.group_settings"
@label="admin.badges.group_settings" @label="admin.badges.group_settings"
@icon="cog" @icon="gear"
class="edit-groupings-btn" class="edit-groupings-btn"
/> />
</:actions> </:actions>

6
app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
View File

@ -48,7 +48,7 @@
class="btn-primary" class="btn-primary"
/> />
<LinkTo @route="adminBadges.index" class="btn btn-normal"> <LinkTo @route="adminBadges.index" class="btn btn-normal">
{{d-icon "times"}} {{d-icon "xmark"}}
<span>{{i18n "cancel"}}</span> <span>{{i18n "cancel"}}</span>
</LinkTo> </LinkTo>
</form> </form>
@ -60,14 +60,14 @@
{{#if this.success}} {{#if this.success}}
{{d-icon "check" class="bulk-award-status-icon success"}} {{d-icon "check" class="bulk-award-status-icon success"}}
{{else}} {{else}}
{{d-icon "times" class="bulk-award-status-icon failure"}} {{d-icon "xmark" class="bulk-award-status-icon failure"}}
{{/if}} {{/if}}
{{this.resultsMessage}} {{this.resultsMessage}}
</p> </p>
{{#if this.unmatchedEntries.length}} {{#if this.unmatchedEntries.length}}
<p> <p>
{{d-icon {{d-icon
"exclamation-triangle" "triangle-exclamation"
class="bulk-award-status-icon failure" class="bulk-award-status-icon failure"
}} }}
<span> <span>

6
app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
View File

@ -33,7 +33,7 @@
@route="adminSiteText" @route="adminSiteText"
@query={{hash q=(concat this.textCustomizationPrefix "name")}} @query={{hash q=(concat this.textCustomizationPrefix "name")}}
> >
{{d-icon "pencil-alt"}} {{d-icon "pencil"}}
</LinkTo> </LinkTo>
</form.Container> </form.Container>
{{else}} {{else}}
@ -116,7 +116,7 @@
@route="adminSiteText" @route="adminSiteText"
@query={{hash q=(concat this.textCustomizationPrefix "description")}} @query={{hash q=(concat this.textCustomizationPrefix "description")}}
> >
{{d-icon "pencil-alt"}} {{d-icon "pencil"}}
</LinkTo> </LinkTo>
</form.Container> </form.Container>
{{else}} {{else}}
@ -145,7 +145,7 @@
q=(concat this.textCustomizationPrefix "long_description") q=(concat this.textCustomizationPrefix "long_description")
}} }}
> >
{{d-icon "pencil-alt"}} {{d-icon "pencil"}}
</LinkTo> </LinkTo>
</form.Container> </form.Container>
{{else}} {{else}}

6
app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
View File

@ -20,7 +20,7 @@
{{#each this.model as |k|}} {{#each this.model as |k|}}
<tr class={{if k.revoked_at "revoked"}}> <tr class={{if k.revoked_at "revoked"}}>
<td class="key"> <td class="key">
{{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}} {{#if k.revoked_at}}{{d-icon "circle-xmark"}}{{/if}}
{{k.truncatedKey}} {{k.truncatedKey}}
</td> </td>
<td class="key-description"> <td class="key-description">
@ -57,13 +57,13 @@
{{#if k.revoked_at}} {{#if k.revoked_at}}
<DButton <DButton
@action={{fn this.undoRevokeKey k}} @action={{fn this.undoRevokeKey k}}
@icon="undo" @icon="arrow-rotate-left"
@title="admin.api.undo_revoke" @title="admin.api.undo_revoke"
/> />
{{else}} {{else}}
<DButton <DButton
@action={{fn this.revokeKey k}} @action={{fn this.revokeKey k}}
@icon="times" @icon="xmark"
@title="admin.api.revoke" @title="admin.api.revoke"
class="btn-danger" class="btn-danger"
/> />

2
app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
View File

@ -89,7 +89,7 @@
<td> <td>
<div class="scope-name">{{act.name}}</div> <div class="scope-name">{{act.name}}</div>
<DTooltip <DTooltip
@icon="question-circle" @icon="circle-question"
@content={{i18n @content={{i18n
(concat (concat
"admin.api.scopes.descriptions." resource "." act.key "admin.api.scopes.descriptions." resource "." act.key

14
app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
View File

@ -5,7 +5,7 @@
<div class="api-key api-key-show"> <div class="api-key api-key-show">
<AdminFormRow @label="admin.api.key"> <AdminFormRow @label="admin.api.key">
{{#if this.model.revoked_at}}{{d-icon "times-circle"}}{{/if}} {{#if this.model.revoked_at}}{{d-icon "circle-xmark"}}{{/if}}
{{this.model.truncatedKey}} {{this.model.truncatedKey}}
</AdminFormRow> </AdminFormRow>
@ -31,13 +31,13 @@
<DButton @action={{this.saveDescription}} @icon="check" class="ok" /> <DButton @action={{this.saveDescription}} @icon="check" class="ok" />
<DButton <DButton
@action={{this.editDescription}} @action={{this.editDescription}}
@icon="times" @icon="xmark"
class="cancel" class="cancel"
/> />
{{else}} {{else}}
<DButton <DButton
@action={{this.editDescription}} @action={{this.editDescription}}
@icon="pencil-alt" @icon="pencil"
class="btn-default" class="btn-default"
/> />
{{/if}} {{/if}}
@ -81,19 +81,19 @@
{{#if this.model.revoked_at}} {{#if this.model.revoked_at}}
<DButton <DButton
@action={{fn this.undoRevokeKey this.model}} @action={{fn this.undoRevokeKey this.model}}
@icon="undo" @icon="arrow-rotate-left"
@label="admin.api.undo_revoke" @label="admin.api.undo_revoke"
/> />
<DButton <DButton
@action={{fn this.deleteKey this.model}} @action={{fn this.deleteKey this.model}}
@icon="trash-alt" @icon="trash-can"
@label="admin.api.delete" @label="admin.api.delete"
class="btn-danger" class="btn-danger"
/> />
{{else}} {{else}}
<DButton <DButton
@action={{fn this.revokeKey this.model}} @action={{fn this.revokeKey this.model}}
@icon="times" @icon="xmark"
@label="admin.api.revoke" @label="admin.api.revoke"
class="btn-danger" class="btn-danger"
/> />
@ -120,7 +120,7 @@
<td> <td>
{{scope.action}} {{scope.action}}
<DTooltip <DTooltip
@icon="question-circle" @icon="circle-question"
@content={{i18n @content={{i18n
(concat (concat
"admin.api.scopes.descriptions." "admin.api.scopes.descriptions."

6
app/assets/javascripts/admin/addon/templates/backups-index.hbs
View File

@ -13,7 +13,7 @@
{{#if this.status.restoreDisabled}} {{#if this.status.restoreDisabled}}
<div class="backup-message alert alert-info"> <div class="backup-message alert alert-info">
{{dIcon "info-circle"}} {{dIcon "circle-info"}}
{{html-safe {{html-safe
(i18n (i18n
"admin.backups.operations.restore.is_disabled" "admin.backups.operations.restore.is_disabled"
@ -46,14 +46,14 @@
<DMenu <DMenu
@identifier="backup-item-menu" @identifier="backup-item-menu"
@title={{i18n "more_options"}} @title={{i18n "more_options"}}
@icon="ellipsis-v" @icon="ellipsis-vertical"
class="btn-small" class="btn-small"
> >
<:content> <:content>
<DropdownMenu as |dropdown|> <DropdownMenu as |dropdown|>
<dropdown.item> <dropdown.item>
<DButton <DButton
@icon="far-trash-alt" @icon="trash-can"
@action={{fn (route-action "destroyBackup") backup}} @action={{fn (route-action "destroyBackup") backup}}
@disabled={{this.status.isOperationRunning}} @disabled={{this.status.isOperationRunning}}
@title={{this.deleteTitle}} @title={{this.deleteTitle}}

2
app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
View File

@ -39,7 +39,7 @@
{{else}} {{else}}
<DButton <DButton
@action={{this.destroy}} @action={{this.destroy}}
@icon="far-trash-alt" @icon="trash-can"
@label="admin.customize.delete" @label="admin.customize.delete"
class="btn-danger" class="btn-danger"
/> />

2
app/assets/javascripts/admin/addon/templates/customize-colors.hbs
View File

@ -10,7 +10,7 @@
@model={{scheme}} @model={{scheme}}
@replace={{true}} @replace={{true}}
> >
{{d-icon "paint-brush"}} {{d-icon "paintbrush"}}
{{scheme.description}} {{scheme.description}}
</LinkTo> </LinkTo>
</li> </li>

2
app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
View File

@ -15,7 +15,7 @@
> >
<DButton <DButton
@disabled={{this.resetDisabled}} @disabled={{this.resetDisabled}}
@icon="undo" @icon="arrow-rotate-left"
@action={{this.reset}} @action={{this.reset}}
@label="admin.settings.reset" @label="admin.settings.reset"
class="btn-default" class="btn-default"

22
app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
View File

@ -20,14 +20,14 @@
/> />
<DButton <DButton
@action={{this.cancelEditingName}} @action={{this.cancelEditingName}}
@icon="times" @icon="xmark"
class="btn-small cancel-edit" class="btn-small cancel-edit"
/> />
{{else}} {{else}}
<span>{{this.model.name}}</span> <span>{{this.model.name}}</span>
<DButton <DButton
@action={{this.startEditingName}} @action={{this.startEditingName}}
@icon="pencil-alt" @icon="pencil"
class="btn-small" class="btn-small"
/> />
{{/if}} {{/if}}
@ -59,7 +59,7 @@
{{#if this.showRemoteError}} {{#if this.showRemoteError}}
<div class="error-message"> <div class="error-message">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{i18n "admin.customize.theme.repo_unreachable"}} {{i18n "admin.customize.theme.repo_unreachable"}}
</div> </div>
<div class="raw-error"> <div class="raw-error">
@ -76,7 +76,7 @@
<DButton <DButton
@action={{this.destroyTheme}} @action={{this.destroyTheme}}
@label="admin.customize.delete" @label="admin.customize.delete"
@icon="trash-alt" @icon="trash-can"
class="btn-danger" class="btn-danger"
/> />
@ -185,7 +185,7 @@
{{#if this.showRemoteError}} {{#if this.showRemoteError}}
<div class="error-message"> <div class="error-message">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{i18n "admin.customize.theme.repo_unreachable"}} {{i18n "admin.customize.theme.repo_unreachable"}}
</div> </div>
<div class="raw-error"> <div class="raw-error">
@ -203,7 +203,7 @@
{{else}} {{else}}
<DButton <DButton
@action={{this.checkForThemeUpdates}} @action={{this.checkForThemeUpdates}}
@icon="sync" @icon="arrows-rotate"
@label="admin.customize.theme.check_for_updates" @label="admin.customize.theme.check_for_updates"
class="btn-default" class="btn-default"
/> />
@ -240,7 +240,7 @@
</span> </span>
{{else}} {{else}}
<span class="status-message"> <span class="status-message">
{{d-icon "info-circle"}} {{d-icon "circle-info"}}
{{i18n "admin.customize.theme.imported_from_archive"}} {{i18n "admin.customize.theme.imported_from_archive"}}
</span> </span>
{{/if}} {{/if}}
@ -296,7 +296,7 @@
<ColorPalettes <ColorPalettes
@content={{this.colorSchemes}} @content={{this.colorSchemes}}
@value={{this.colorSchemeId}} @value={{this.colorSchemeId}}
@icon="paint-brush" @icon="paintbrush"
@options={{hash filterable=true}} @options={{hash filterable=true}}
/> />
{{#if this.colorSchemeId}} {{#if this.colorSchemeId}}
@ -322,7 +322,7 @@
/> />
<DButton <DButton
@action={{this.cancelChangeScheme}} @action={{this.cancelChangeScheme}}
@icon="times" @icon="xmark"
class="cancel cancel-edit" class="cancel cancel-edit"
/> />
{{/if}} {{/if}}
@ -395,7 +395,7 @@
<span class="col"> <span class="col">
<DButton <DButton
@action={{fn this.removeUpload upload}} @action={{fn this.removeUpload upload}}
@icon="times" @icon="xmark"
class="second btn-default btn-default cancel-edit" class="second btn-default btn-default cancel-edit"
/> />
</span> </span>
@ -546,7 +546,7 @@
<DButton <DButton
@action={{this.destroyTheme}} @action={{this.destroyTheme}}
@label="admin.customize.delete" @label="admin.customize.delete"
@icon="trash-alt" @icon="trash-can"
class="btn-danger" class="btn-danger"
/> />
</div> </div>

2
app/assets/javascripts/admin/addon/templates/email-bounced.hbs
View File

@ -61,7 +61,7 @@
{{on "click" (fn this.handleShowIncomingEmail l.id)}} {{on "click" (fn this.handleShowIncomingEmail l.id)}}
title={{i18n "admin.email.details_title"}} title={{i18n "admin.email.details_title"}}
> >
{{d-icon "info-circle"}} {{d-icon "circle-info"}}
</a> </a>
{{/if}} {{/if}}
</td> </td>

6
app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
View File

@ -9,7 +9,11 @@
<EmailGroupUserChooser <EmailGroupUserChooser
@value={{this.username}} @value={{this.username}}
@onChange={{action "updateUsername"}} @onChange={{action "updateUsername"}}
@options={{hash maximum=1}} @options={{hash
maximum=1
caretDownIcon="caret-down"
caretUpIcon="caret-up"
}}
/> />
<DButton <DButton
@action={{this.refresh}} @action={{this.refresh}}

2
app/assets/javascripts/admin/addon/templates/email-rejected.hbs
View File

@ -73,7 +73,7 @@
{{on "click" (fn this.handleShowIncomingEmail email.id)}} {{on "click" (fn this.handleShowIncomingEmail email.id)}}
title={{i18n "admin.email.details_title"}} title={{i18n "admin.email.details_title"}}
> >
{{d-icon "info-circle"}} {{d-icon "circle-info"}}
</a> </a>
</td> </td>
</tr> </tr>

2
app/assets/javascripts/admin/addon/templates/email-sent.hbs
View File

@ -51,7 +51,7 @@
</td> </td>
<td class="sent-email-address"> <td class="sent-email-address">
{{#if l.bounced}}{{d-icon {{#if l.bounced}}{{d-icon
"redo" "arrow-rotate-right"
title="admin.email.bounced" title="admin.email.bounced"
}}{{/if}} }}{{/if}}
<p><a <p><a

2
app/assets/javascripts/admin/addon/templates/emojis.hbs
View File

@ -51,7 +51,7 @@
<td class="action"> <td class="action">
<DButton <DButton
@action={{fn this.destroyEmoji e}} @action={{fn this.destroyEmoji e}}
@icon="far-trash-alt" @icon="trash-can"
class="btn-danger" class="btn-danger"
/> />
</td> </td>

4
app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
View File

@ -95,12 +95,12 @@
{{else}} {{else}}
<DButton <DButton
@action={{fn this.destroyRecord item}} @action={{fn this.destroyRecord item}}
@icon="far-trash-alt" @icon="trash-can"
class="btn-default btn-danger" class="btn-default btn-danger"
/> />
<DButton <DButton
@action={{fn this.edit item}} @action={{fn this.edit item}}
@icon="pencil-alt" @icon="pencil"
class="btn-default" class="btn-default"
/> />
{{#if item.isBlocked}} {{#if item.isBlocked}}

14
app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
View File

@ -18,7 +18,7 @@
> >
<span class="label">{{i18n "admin.logs.action"}}</span>: <span class="label">{{i18n "admin.logs.action"}}</span>:
{{this.actionFilter}} {{this.actionFilter}}
{{d-icon "times-circle"}} {{d-icon "circle-xmark"}}
</a> </a>
{{/if}} {{/if}}
{{#if this.filters.acting_user}} {{#if this.filters.acting_user}}
@ -31,7 +31,7 @@
"admin.logs.staff_actions.staff_user" "admin.logs.staff_actions.staff_user"
}}</span>: }}</span>:
{{this.filters.acting_user}} {{this.filters.acting_user}}
{{d-icon "times-circle"}} {{d-icon "circle-xmark"}}
</a> </a>
{{/if}} {{/if}}
{{#if this.filters.target_user}} {{#if this.filters.target_user}}
@ -44,7 +44,7 @@
"admin.logs.staff_actions.target_user" "admin.logs.staff_actions.target_user"
}}</span>: }}</span>:
{{this.filters.target_user}} {{this.filters.target_user}}
{{d-icon "times-circle"}} {{d-icon "circle-xmark"}}
</a> </a>
{{/if}} {{/if}}
{{#if this.filters.subject}} {{#if this.filters.subject}}
@ -57,7 +57,7 @@
"admin.logs.staff_actions.subject" "admin.logs.staff_actions.subject"
}}</span>: }}</span>:
{{this.filters.subject}} {{this.filters.subject}}
{{d-icon "times-circle"}} {{d-icon "circle-xmark"}}
</a> </a>
{{/if}} {{/if}}
</div> </div>
@ -109,7 +109,7 @@
class="deleted-user" class="deleted-user"
title={{i18n "admin.user.deleted"}} title={{i18n "admin.user.deleted"}}
> >
{{d-icon "far-trash-alt"}} {{d-icon "trash-can"}}
</span> </span>
{{/if}} {{/if}}
</div> </div>
@ -154,14 +154,14 @@
<a <a
href href
{{on "click" (fn this.showCustomDetailsModal item)}} {{on "click" (fn this.showCustomDetailsModal item)}}
>{{d-icon "info-circle"}} >{{d-icon "circle-info"}}
{{i18n "admin.logs.staff_actions.show"}}</a> {{i18n "admin.logs.staff_actions.show"}}</a>
{{/if}} {{/if}}
{{#if item.useModalForDetails}} {{#if item.useModalForDetails}}
<a <a
href href
{{on "click" (fn this.showDetailsModal item)}} {{on "click" (fn this.showDetailsModal item)}}
>{{d-icon "info-circle"}} >{{d-icon "circle-info"}}
{{i18n "admin.logs.staff_actions.show"}}</a> {{i18n "admin.logs.staff_actions.show"}}</a>
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/admin/addon/templates/permalinks.hbs
View File

@ -56,7 +56,7 @@
{{/if}} {{/if}}
{{#if pl.external_url}} {{#if pl.external_url}}
{{#if pl.linkIsExternal}} {{#if pl.linkIsExternal}}
{{d-icon "external-link-alt"}} {{d-icon "up-right-from-square"}}
{{/if}} {{/if}}
<a href={{pl.external_url}}>{{pl.external_url}}</a> <a href={{pl.external_url}}>{{pl.external_url}}</a>
{{/if}} {{/if}}
@ -67,7 +67,7 @@
<td class="col action" style="text-align: right;"> <td class="col action" style="text-align: right;">
<DButton <DButton
@action={{fn this.destroyRecord pl}} @action={{fn this.destroyRecord pl}}
@icon="far-trash-alt" @icon="trash-can"
class="btn-danger" class="btn-danger"
/> />
</td> </td>

2
app/assets/javascripts/admin/addon/templates/plugins-index.hbs
View File

@ -35,7 +35,7 @@
</AdminPageHeader> </AdminPageHeader>
<div class="alert alert-info -top-margin admin-plugins-howto"> <div class="alert alert-info -top-margin admin-plugins-howto">
{{dIcon "info-circle"}} {{dIcon "circle-info"}}
<a href="https://meta.discourse.org/t/install-a-plugin/19157"> <a href="https://meta.discourse.org/t/install-a-plugin/19157">
{{i18n "admin.plugins.howto"}} {{i18n "admin.plugins.howto"}}
</a> </a>

2
app/assets/javascripts/admin/addon/templates/site-text-index.hbs
View File

@ -14,7 +14,7 @@
@action={{this.showReseedModal}} @action={{this.showReseedModal}}
@label="admin.reseed.action.label" @label="admin.reseed.action.label"
@title="admin.reseed.action.title" @title="admin.reseed.action.title"
@icon="sync" @icon="arrows-rotate"
class="btn-default" class="btn-default"
/> />
</div> </div>

30
app/assets/javascripts/admin/addon/templates/user-index.hbs
View File

@ -232,7 +232,7 @@
{{#if this.canDisableSecondFactor}} {{#if this.canDisableSecondFactor}}
<DButton <DButton
@action={{this.disableSecondFactor}} @action={{this.disableSecondFactor}}
@icon="unlock-alt" @icon="unlock-keyhole"
@label="user.second_factor.disable" @label="user.second_factor.disable"
class="btn-default" class="btn-default"
/> />
@ -365,7 +365,7 @@
{{#if this.model.can_revoke_admin}} {{#if this.model.can_revoke_admin}}
<DButton <DButton
@action={{this.revokeAdmin}} @action={{this.revokeAdmin}}
@icon="shield-alt" @icon="shield-halved"
@label="admin.user.revoke_admin" @label="admin.user.revoke_admin"
class="btn-default" class="btn-default"
/> />
@ -373,7 +373,7 @@
{{#if this.model.can_grant_admin}} {{#if this.model.can_grant_admin}}
<DButton <DButton
@action={{this.grantAdmin}} @action={{this.grantAdmin}}
@icon="shield-alt" @icon="shield-halved"
@label="admin.user.grant_admin" @label="admin.user.grant_admin"
class="btn-default grant-admin" class="btn-default grant-admin"
/> />
@ -388,7 +388,7 @@
{{#if this.model.can_revoke_moderation}} {{#if this.model.can_revoke_moderation}}
<DButton <DButton
@action={{this.revokeModeration}} @action={{this.revokeModeration}}
@icon="shield-alt" @icon="shield-halved"
@label="admin.user.revoke_moderation" @label="admin.user.revoke_moderation"
class="btn-default" class="btn-default"
/> />
@ -396,7 +396,7 @@
{{#if this.model.can_grant_moderation}} {{#if this.model.can_grant_moderation}}
<DButton <DButton
@action={{this.grantModeration}} @action={{this.grantModeration}}
@icon="shield-alt" @icon="shield-halved"
@label="admin.user.grant_moderation" @label="admin.user.grant_moderation"
class="btn-default" class="btn-default"
/> />
@ -423,7 +423,7 @@
/> />
<DButton <DButton
@action={{this.restoreTrustLevel}} @action={{this.restoreTrustLevel}}
@icon="times" @icon="xmark"
class="cancel no-text" class="cancel no-text"
/> />
</div> </div>
@ -585,7 +585,7 @@
<div class="controls"> <div class="controls">
<DButton <DButton
@label="admin.user.clear_penalty_history.title" @label="admin.user.clear_penalty_history.title"
@icon="times" @icon="xmark"
@action={{this.clearPenaltyHistory}} @action={{this.clearPenaltyHistory}}
class="btn-default" class="btn-default"
/> />
@ -618,7 +618,7 @@
<div class="controls"> <div class="controls">
<DButton @icon="check" @action={{this.saveCustomGroups}} class="ok" /> <DButton @icon="check" @action={{this.saveCustomGroups}} class="ok" />
<DButton <DButton
@icon="times" @icon="xmark"
@action={{this.resetCustomGroups}} @action={{this.resetCustomGroups}}
class="cancel" class="cancel"
/> />
@ -644,7 +644,7 @@
class="ok" class="ok"
/> />
<DButton <DButton
@icon="times" @icon="xmark"
@action={{this.resetPrimaryGroup}} @action={{this.resetPrimaryGroup}}
class="cancel" class="cancel"
/> />
@ -694,7 +694,7 @@
{{#if this.model.post_count}} {{#if this.model.post_count}}
<DButton <DButton
@action={{this.showDeletePostsConfirmation}} @action={{this.showDeletePostsConfirmation}}
@icon="far-trash-alt" @icon="trash-can"
@label="admin.user.delete_posts.button" @label="admin.user.delete_posts.button"
class="btn-danger" class="btn-danger"
/> />
@ -782,7 +782,7 @@
<div class="controls"> <div class="controls">
<DButton <DButton
@action={{this.deleteSSORecord}} @action={{this.deleteSSORecord}}
@icon="far-trash-alt" @icon="trash-can"
@label="admin.user.discourse_connect.delete_sso_record" @label="admin.user.discourse_connect.delete_sso_record"
class="btn-danger" class="btn-danger"
/> />
@ -877,7 +877,7 @@
{{#if this.model.can_be_anonymized}} {{#if this.model.can_be_anonymized}}
<DButton <DButton
@label="admin.user.anonymize" @label="admin.user.anonymize"
@icon="exclamation-triangle" @icon="triangle-exclamation"
@action={{this.anonymize}} @action={{this.anonymize}}
class="btn-danger btn-anonymize" class="btn-danger btn-anonymize"
/> />
@ -886,7 +886,7 @@
{{#if this.model.canBeDeleted}} {{#if this.model.canBeDeleted}}
<DButton <DButton
@label="admin.user.delete" @label="admin.user.delete"
@icon="trash-alt" @icon="trash-can"
@action={{this.destroyUser}} @action={{this.destroyUser}}
class="btn-danger btn-user-delete" class="btn-danger btn-user-delete"
/> />
@ -895,7 +895,7 @@
{{#if this.model.can_be_merged}} {{#if this.model.can_be_merged}}
<DButton <DButton
@label="admin.user.merge.button" @label="admin.user.merge.button"
@icon="arrows-alt-h" @icon="left-right"
@action={{this.promptTargetUser}} @action={{this.promptTargetUser}}
class="btn-danger btn-user-merge" class="btn-danger btn-user-merge"
/> />
@ -906,7 +906,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<br /> <br />
<div class="pull-right"> <div class="pull-right">
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{this.deleteExplanation}} {{this.deleteExplanation}}
</div> </div>
{{/if}} {{/if}}

6
app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
View File

@ -145,11 +145,11 @@
{{#if this.model.tl3Requirements.requirements_lost}} {{#if this.model.tl3Requirements.requirements_lost}}
{{! tl implicitly not locked }} {{! tl implicitly not locked }}
{{#if this.model.tl3Requirements.on_grace_period}} {{#if this.model.tl3Requirements.on_grace_period}}
{{d-icon "times"}} {{d-icon "xmark"}}
{{i18n "admin.user.tl3_requirements.on_grace_period"}} {{i18n "admin.user.tl3_requirements.on_grace_period"}}
{{else}} {{else}}
{{! not on grace period }} {{! not on grace period }}
{{d-icon "times"}} {{d-icon "xmark"}}
{{i18n "admin.user.tl3_requirements.does_not_qualify"}} {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
{{i18n "admin.user.tl3_requirements.will_be_demoted"}} {{i18n "admin.user.tl3_requirements.will_be_demoted"}}
{{/if}} {{/if}}
@ -180,7 +180,7 @@
{{d-icon "lock"}} {{d-icon "lock"}}
{{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}} {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
{{else}} {{else}}
{{d-icon "times"}} {{d-icon "xmark"}}
{{i18n "admin.user.tl3_requirements.does_not_qualify"}} {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
{{/if}} {{/if}}
{{/if}} {{/if}}

4
app/assets/javascripts/admin/addon/templates/users-list-show.hbs
View File

@ -256,10 +256,10 @@
</span> </span>
<span class="directory-table__value"> <span class="directory-table__value">
{{#if user.admin}} {{#if user.admin}}
{{d-icon "shield-alt" title="admin.title"}} {{d-icon "shield-halved" title="admin.title"}}
{{/if}} {{/if}}
{{#if user.moderator}} {{#if user.moderator}}
{{d-icon "shield-alt" title="admin.moderator"}} {{d-icon "shield-halved" title="admin.moderator"}}
{{/if}} {{/if}}
{{#if user.second_factor_enabled}} {{#if user.second_factor_enabled}}
{{d-icon "lock" title="admin.user.second_factor_enabled"}} {{d-icon "lock" title="admin.user.second_factor_enabled"}}

2
app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
View File

@ -26,7 +26,7 @@
<DButton <DButton
@label="admin.watched_words.clear_all" @label="admin.watched_words.clear_all"
@icon="trash-alt" @icon="trash-can"
@action={{this.clearAll}} @action={{this.clearAll}}
class="btn-danger clear-all" class="btn-danger clear-all"
/> />

4
app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
View File

@ -47,12 +47,12 @@
class="btn btn-default no-text" class="btn btn-default no-text"
title={{i18n "admin.web_hooks.edit"}} title={{i18n "admin.web_hooks.edit"}}
> >
{{d-icon "far-edit"}} {{d-icon "far-pen-to-square"}}
</LinkTo> </LinkTo>
<DButton <DButton
@action={{fn this.destroyWebhook webhook}} @action={{fn this.destroyWebhook webhook}}
@icon="times" @icon="xmark"
@title="delete" @title="delete"
class="destroy btn-danger" class="destroy btn-danger"
/> />

4
app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
View File

@ -9,14 +9,14 @@
<DButton <DButton
@action={{this.edit}} @action={{this.edit}}
@icon="far-edit" @icon="far-pen-to-square"
@title={{i18n "admin.web_hooks.edit"}} @title={{i18n "admin.web_hooks.edit"}}
class="no-text admin-webhooks__edit-button" class="no-text admin-webhooks__edit-button"
/> />
<DButton <DButton
@action={{this.destroyWebhook}} @action={{this.destroyWebhook}}
@icon="times" @icon="xmark"
@title="delete" @title="delete"
class="destroy btn-danger admin-webhooks__delete-button" class="destroy btn-danger admin-webhooks__delete-button"
/> />

2
app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs
View File

@ -35,7 +35,7 @@ export default class DialogHolder extends Component {
<DButton <DButton
@action={{this.dialog.cancel}} @action={{this.dialog.cancel}}
@title="modal.close" @title="modal.close"
@icon="times" @icon="xmark"
class="btn-flat dialog-close close" class="btn-flat dialog-close close"
/> />
</div> </div>

10
app/assets/javascripts/discourse/app/components/about-page.gjs
View File

@ -47,7 +47,7 @@ export default class AboutPage extends Component {
}, },
{ {
class: "admins", class: "admins",
icon: "shield-alt", icon: "shield-halved",
text: I18n.t("about.admin_count", { text: I18n.t("about.admin_count", {
count: this.adminsCount, count: this.adminsCount,
formatted_number: I18n.toNumber(this.adminsCount, { precision: 0 }), formatted_number: I18n.toNumber(this.adminsCount, { precision: 0 }),
@ -55,7 +55,7 @@ export default class AboutPage extends Component {
}, },
{ {
class: "moderators", class: "moderators",
icon: "shield-alt", icon: "shield-halved",
text: I18n.t("about.moderator_count", { text: I18n.t("about.moderator_count", {
count: this.moderatorsCount, count: this.moderatorsCount,
formatted_number: I18n.toNumber(this.moderatorsCount, { formatted_number: I18n.toNumber(this.moderatorsCount, {
@ -65,7 +65,7 @@ export default class AboutPage extends Component {
}, },
{ {
class: "site-creation-date", class: "site-creation-date",
icon: "calendar-alt", icon: "calendar-days",
text: this.siteAgeString, text: this.siteAgeString,
}, },
]; ];
@ -83,7 +83,7 @@ export default class AboutPage extends Component {
period: I18n.t("about.activities.periods.last_7_days"), period: I18n.t("about.activities.periods.last_7_days"),
}, },
{ {
icon: "pencil-alt", icon: "pencil",
class: "posts", class: "posts",
activityText: I18n.t("about.activities.posts", { activityText: I18n.t("about.activities.posts", {
count: this.args.model.stats.posts_last_day, count: this.args.model.stats.posts_last_day,
@ -92,7 +92,7 @@ export default class AboutPage extends Component {
period: I18n.t("about.activities.periods.today"), period: I18n.t("about.activities.periods.today"),
}, },
{ {
icon: "user-friends", icon: "user-group",
class: "active-users", class: "active-users",
activityText: I18n.t("about.activities.active_users", { activityText: I18n.t("about.activities.active_users", {
count: this.args.model.stats.active_users_7_days, count: this.args.model.stats.active_users_7_days,

2
app/assets/javascripts/discourse/app/components/actions-summary.gjs
View File

@ -9,7 +9,7 @@ const ActionsSummary = <template>
{{/each}} {{/each}}
{{#if @data.deleted_at}} {{#if @data.deleted_at}}
<div class="post-action deleted-post"> <div class="post-action deleted-post">
{{dIcon "far-trash-alt"}} {{dIcon "trash-can"}}
<a <a
class="trigger-user-card" class="trigger-user-card"
data-user-card={{@data.deletedByUsername}} data-user-card={{@data.deletedByUsername}}

2
app/assets/javascripts/discourse/app/components/activation-controls.gjs
View File

@ -26,7 +26,7 @@ export default class ActivationControls extends Component {
<DButton <DButton
@action={{@editActivationEmail}} @action={{@editActivationEmail}}
@label="login.change_email" @label="login.change_email"
@icon="pencil-alt" @icon="pencil"
class="edit-email" class="edit-email"
/> />
{{/if}} {{/if}}

10
app/assets/javascripts/discourse/app/components/admin-post-menu.gjs
View File

@ -67,7 +67,7 @@ export default class AdminPostMenu extends Component {
"post.controls.revert_to_regular" "post.controls.revert_to_regular"
"post.controls.convert_to_moderator" "post.controls.convert_to_moderator"
}} }}
@icon="shield-alt" @icon="shield-halved"
class={{concatClass class={{concatClass
"btn btn-transparent toggle-post-type" "btn btn-transparent toggle-post-type"
(if @data.transformedPost.isModeratorAction "btn-success") (if @data.transformedPost.isModeratorAction "btn-success")
@ -170,7 +170,7 @@ export default class AdminPostMenu extends Component {
<dropdown.item> <dropdown.item>
<DButton <DButton
@label="post.controls.permanently_delete" @label="post.controls.permanently_delete"
@icon="trash-alt" @icon="trash-can"
class="btn btn-transparent permanently-delete" class="btn btn-transparent permanently-delete"
@action={{fn this.topicAction "permanentlyDeletePost"}} @action={{fn this.topicAction "permanentlyDeletePost"}}
/> />
@ -182,7 +182,7 @@ export default class AdminPostMenu extends Component {
<dropdown.item> <dropdown.item>
<DButton <DButton
@label="post.controls.unwiki" @label="post.controls.unwiki"
@icon="far-edit" @icon="far-pen-to-square"
class={{concatClass class={{concatClass
"btn btn-transparent wiki wikied" "btn btn-transparent wiki wikied"
(if @data.transformedPost.wiki "btn-success") (if @data.transformedPost.wiki "btn-success")
@ -194,7 +194,7 @@ export default class AdminPostMenu extends Component {
<dropdown.item> <dropdown.item>
<DButton <DButton
@label="post.controls.wiki" @label="post.controls.wiki"
@icon="far-edit" @icon="far-pen-to-square"
class="btn btn-transparent wiki" class="btn btn-transparent wiki"
@action={{fn this.topicAction "toggleWiki"}} @action={{fn this.topicAction "toggleWiki"}}
/> />
@ -217,7 +217,7 @@ export default class AdminPostMenu extends Component {
<dropdown.item> <dropdown.item>
<DButton <DButton
@label="post.controls.rebake" @label="post.controls.rebake"
@icon="sync-alt" @icon="rotate"
class="btn btn-transparent rebuild-html" class="btn btn-transparent rebuild-html"
@action={{fn this.topicAction "rebakePost"}} @action={{fn this.topicAction "rebakePost"}}
/> />

4
app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
View File

@ -15,13 +15,13 @@ export default class AuthTokenDropdown extends DropdownSelectBoxComponent {
return [ return [
{ {
id: "notYou", id: "notYou",
icon: "user-times", icon: "user-xmark",
name: I18n.t("user.auth_tokens.not_you"), name: I18n.t("user.auth_tokens.not_you"),
description: "", description: "",
}, },
{ {
id: "logOut", id: "logOut",
icon: "sign-out-alt", icon: "right-from-bracket",
name: I18n.t("user.log_out"), name: I18n.t("user.log_out"),
description: "", description: "",
}, },

6
app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
View File

@ -27,14 +27,14 @@ export default class BookmarkActionsDropdown extends DropdownSelectBoxComponent
actions.push({ actions.push({
id: ACTION_REMOVE, id: ACTION_REMOVE,
icon: "trash-alt", icon: "trash-can",
name: I18n.t("post.bookmarks.actions.delete_bookmark.name"), name: I18n.t("post.bookmarks.actions.delete_bookmark.name"),
description: I18n.t("post.bookmarks.actions.delete_bookmark.description"), description: I18n.t("post.bookmarks.actions.delete_bookmark.description"),
}); });
actions.push({ actions.push({
id: ACTION_EDIT, id: ACTION_EDIT,
icon: "pencil-alt", icon: "pencil",
name: I18n.t("post.bookmarks.actions.edit_bookmark.name"), name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
description: I18n.t("post.bookmarks.actions.edit_bookmark.description"), description: I18n.t("post.bookmarks.actions.edit_bookmark.description"),
}); });
@ -42,7 +42,7 @@ export default class BookmarkActionsDropdown extends DropdownSelectBoxComponent
if (bookmark.reminder_at) { if (bookmark.reminder_at) {
actions.push({ actions.push({
id: ACTION_CLEAR_REMINDER, id: ACTION_CLEAR_REMINDER,
icon: "history", icon: "clock-rotate-left",
name: I18n.t("post.bookmarks.actions.clear_bookmark_reminder.name"), name: I18n.t("post.bookmarks.actions.clear_bookmark_reminder.name"),
description: I18n.t( description: I18n.t(
"post.bookmarks.actions.clear_bookmark_reminder.description" "post.bookmarks.actions.clear_bookmark_reminder.description"

6
app/assets/javascripts/discourse/app/components/bookmark-list.hbs
View File

@ -12,7 +12,7 @@
<FlatButton <FlatButton
@action={{this.toggleBulkSelect}} @action={{this.toggleBulkSelect}}
@class="bulk-select" @class="bulk-select"
@icon="tasks" @icon="list-check"
@title="bookmarks.bulk.toggle" @title="bookmarks.bulk.toggle"
/> />
</th> </th>
@ -50,7 +50,7 @@
<FlatButton <FlatButton
@action={{this.toggleBulkSelect}} @action={{this.toggleBulkSelect}}
@class="bulk-select" @class="bulk-select"
@icon="tasks" @icon="list-check"
@title="bookmarks.bulk.toggle" @title="bookmarks.bulk.toggle"
/> />
{{i18n "topic.title"}} {{i18n "topic.title"}}
@ -101,7 +101,7 @@
{{/if}} {{/if}}
{{#if bookmark.name}} {{#if bookmark.name}}
<span class="bookmark-metadata-item"> <span class="bookmark-metadata-item">
{{d-icon "info-circle"}}<span>{{bookmark.name}}</span> {{d-icon "circle-info"}}<span>{{bookmark.name}}</span>
</span> </span>
{{/if}} {{/if}}
</div> </div>

8
app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
View File

@ -173,7 +173,7 @@ export default class BookmarkMenu extends Component {
this.toasts.success({ this.toasts.success({
duration: 1500, duration: 1500,
data: { data: {
icon: "trash-alt", icon: "trash-can",
message: I18n.t("bookmarks.deleted_bookmark_success"), message: I18n.t("bookmarks.deleted_bookmark_success"),
}, },
}); });
@ -251,7 +251,7 @@ export default class BookmarkMenu extends Component {
<DropdownMenu as |dropdown|> <DropdownMenu as |dropdown|>
{{#unless this.showEditDeleteMenu}} {{#unless this.showEditDeleteMenu}}
<dropdown.item class="bookmark-menu__title"> <dropdown.item class="bookmark-menu__title">
{{icon "check-circle"}} {{icon "circle-check"}}
<span>{{i18n "bookmarks.bookmarked_success"}}</span> <span>{{i18n "bookmarks.bookmarked_success"}}</span>
</dropdown.item> </dropdown.item>
{{/unless}} {{/unless}}
@ -262,7 +262,7 @@ export default class BookmarkMenu extends Component {
data-menu-option-id="edit" data-menu-option-id="edit"
> >
<DButton <DButton
@icon="pencil-alt" @icon="pencil"
@label="edit" @label="edit"
@action={{this.onEditBookmark}} @action={{this.onEditBookmark}}
@class="bookmark-menu__row-btn btn-transparent" @class="bookmark-menu__row-btn btn-transparent"
@ -275,7 +275,7 @@ export default class BookmarkMenu extends Component {
data-menu-option-id="delete" data-menu-option-id="delete"
> >
<DButton <DButton
@icon="trash-alt" @icon="trash-can"
@label="delete" @label="delete"
@action={{this.onRemoveBookmark}} @action={{this.onRemoveBookmark}}
@class="bookmark-menu__row-btn btn-transparent btn-danger" @class="bookmark-menu__row-btn btn-transparent btn-danger"

8
app/assets/javascripts/discourse/app/components/bulk-group-member-dropdown.js
View File

@ -9,7 +9,7 @@ import {
@classNames("bulk-group-member-dropdown") @classNames("bulk-group-member-dropdown")
@selectKitOptions({ @selectKitOptions({
icon: "cog", icon: "gear",
showFullTitle: false, showFullTitle: false,
}) })
@pluginApiIdentifiers("bulk-group-member-dropdown") @pluginApiIdentifiers("bulk-group-member-dropdown")
@ -22,7 +22,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
id: "removeMembers", id: "removeMembers",
name: I18n.t("groups.members.remove_members"), name: I18n.t("groups.members.remove_members"),
description: I18n.t("groups.members.remove_members_description"), description: I18n.t("groups.members.remove_members_description"),
icon: "user-times", icon: "user-xmark",
}); });
if (this.bulkSelection.some((m) => !m.owner)) { if (this.bulkSelection.some((m) => !m.owner)) {
@ -30,7 +30,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
id: "makeOwners", id: "makeOwners",
name: I18n.t("groups.members.make_owners"), name: I18n.t("groups.members.make_owners"),
description: I18n.t("groups.members.make_owners_description"), description: I18n.t("groups.members.make_owners_description"),
icon: "shield-alt", icon: "shield-halved",
}); });
} }
@ -39,7 +39,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
id: "removeOwners", id: "removeOwners",
name: I18n.t("groups.members.remove_owners"), name: I18n.t("groups.members.remove_owners"),
description: I18n.t("groups.members.remove_owners_description"), description: I18n.t("groups.members.remove_owners_description"),
icon: "shield-alt", icon: "shield-halved",
}); });
} }

6
app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
View File

@ -43,7 +43,7 @@ export default class BulkSelectTopicsDropdown extends Component {
let options = [ let options = [
{ {
id: "update-category", id: "update-category",
icon: "pencil-alt", icon: "pencil",
name: i18n("topic_bulk_actions.update_category.name"), name: i18n("topic_bulk_actions.update_category.name"),
visible: ({ topics }) => { visible: ({ topics }) => {
return !topics.some((t) => t.isPrivateMessage); return !topics.some((t) => t.isPrivateMessage);
@ -78,7 +78,7 @@ export default class BulkSelectTopicsDropdown extends Component {
}, },
{ {
id: "archive-messages", id: "archive-messages",
icon: "archive", icon: "box-archive",
name: i18n("topic_bulk_actions.archive_messages.name"), name: i18n("topic_bulk_actions.archive_messages.name"),
visible: ({ topics }) => topics.every((t) => t.isPrivateMessage), visible: ({ topics }) => topics.every((t) => t.isPrivateMessage),
}, },
@ -127,7 +127,7 @@ export default class BulkSelectTopicsDropdown extends Component {
}, },
{ {
id: "delete-topics", id: "delete-topics",
icon: "trash-alt", icon: "trash-can",
name: i18n("topic_bulk_actions.delete_topics.name"), name: i18n("topic_bulk_actions.delete_topics.name"),
visible: ({ currentUser }) => currentUser.staff, visible: ({ currentUser }) => currentUser.staff,
}, },

2
app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
View File

@ -13,6 +13,6 @@ export default class CategoriesBoxesTopic extends Component {
if (closed || archived) { if (closed || archived) {
return "lock"; return "lock";
} }
return "far-file-alt"; return "far-file-lines";
} }
} }

8
app/assets/javascripts/discourse/app/components/category-permission-row.gjs
View File

@ -28,11 +28,11 @@ export default class CategoryPermissionRow extends Component {
} }
get canCreateIcon() { get canCreateIcon() {
return this.canCreate ? "check-square" : "far-square"; return this.canCreate ? "square-check" : "far-square";
} }
get canReplyIcon() { get canReplyIcon() {
return this.canReply ? "check-square" : "far-square"; return this.canReply ? "square-check" : "far-square";
} }
get replyGrantedClass() { get replyGrantedClass() {
@ -138,7 +138,7 @@ export default class CategoryPermissionRow extends Component {
{{/if}} {{/if}}
</span> </span>
<span class="options actionable"> <span class="options actionable">
<DButton @icon="check-square" @disabled={{true}} class="btn-flat see" /> <DButton @icon="square-check" @disabled={{true}} class="btn-flat see" />
<DButton <DButton
@icon={{this.canReplyIcon}} @icon={{this.canReplyIcon}}
@ -162,7 +162,7 @@ export default class CategoryPermissionRow extends Component {
<DButton <DButton
class="remove-permission btn-flat" class="remove-permission btn-flat"
@action={{this.removeRow}} @action={{this.removeRow}}
@icon="far-trash-alt" @icon="trash-can"
/> />
</span> </span>
</div> </div>

16
app/assets/javascripts/discourse/app/components/composer-container.hbs
View File

@ -73,7 +73,7 @@
<LinkToInput <LinkToInput
@onClick={{this.composer.displayEditReason}} @onClick={{this.composer.displayEditReason}}
@showInput={{this.composer.showEditReason}} @showInput={{this.composer.showEditReason}}
@icon="info-circle" @icon="circle-info"
class="display-edit-reason" class="display-edit-reason"
> >
<TextField <TextField
@ -274,9 +274,9 @@
class="cancel" class="cancel"
> >
{{#if this.composer.canEdit}} {{#if this.composer.canEdit}}
{{d-icon "times"}} {{d-icon "xmark"}}
{{else}} {{else}}
{{d-icon "far-trash-alt"}} {{d-icon "trash-can"}}
{{/if}} {{/if}}
</a> </a>
{{else}} {{else}}
@ -342,7 +342,7 @@
@action={{this.composer.togglePreview}} @action={{this.composer.togglePreview}}
@title="composer.hide_preview" @title="composer.hide_preview"
@ariaLabel="composer.hide_preview" @ariaLabel="composer.hide_preview"
@icon="pencil-alt" @icon="pencil"
class="hide-preview" class="hide-preview"
/> />
{{/if}} {{/if}}
@ -368,7 +368,7 @@
href href
id="cancel-file-upload" id="cancel-file-upload"
{{on "click" this.composer.cancelUpload}} {{on "click" this.composer.cancelUpload}}
>{{d-icon "times"}}</a> >{{d-icon "xmark"}}</a>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -387,9 +387,9 @@
this.composer.model.draftConflictUser this.composer.model.draftConflictUser
imageSize="small" imageSize="small"
}} }}
{{d-icon "user-edit"}} {{d-icon "user-pen"}}
{{else}} {{else}}
{{d-icon "exclamation-triangle"}} {{d-icon "triangle-exclamation"}}
{{/if}} {{/if}}
{{#if this.site.desktopView}} {{#if this.site.desktopView}}
{{this.composer.model.draftStatus}} {{this.composer.model.draftStatus}}
@ -402,7 +402,7 @@
<DButton <DButton
@action={{this.composer.togglePreview}} @action={{this.composer.togglePreview}}
@translatedTitle={{this.composer.toggleText}} @translatedTitle={{this.composer.toggleText}}
@icon="angle-double-left" @icon="angles-left"
class={{concat-class class={{concat-class
"btn-transparent btn-mini-toggle toggle-preview" "btn-transparent btn-mini-toggle toggle-preview"
(unless this.composer.showPreview "active") (unless this.composer.showPreview "active")

2
app/assets/javascripts/discourse/app/components/composer-editor.js
View File

@ -951,7 +951,7 @@ export default class ComposerEditor extends Component.extend(
toolbar.addButton({ toolbar.addButton({
id: "options", id: "options",
group: "extras", group: "extras",
icon: "cog", icon: "gear",
title: "composer.options", title: "composer.options",
sendAction: this.onExpandPopupMenuOptions.bind(this), sendAction: this.onExpandPopupMenuOptions.bind(this),
popupMenu: true, popupMenu: true,

2
app/assets/javascripts/discourse/app/components/composer-tip-close-button.hbs
View File

@ -1,6 +1,6 @@
<DButton <DButton
@action={{@action}} @action={{@action}}
@icon="times" @icon="xmark"
@label="composer.esc" @label="composer.esc"
@ariaLabel="composer.esc_label" @ariaLabel="composer.esc_label"
class="btn-transparent close" class="btn-transparent close"

2
app/assets/javascripts/discourse/app/components/composer-toggles.js
View File

@ -28,7 +28,7 @@ export default class ComposerToggles extends Component {
@discourseComputed("composeState") @discourseComputed("composeState")
toggleIcon(composeState) { toggleIcon(composeState) {
return composeState === "draft" || composeState === "saving" return composeState === "draft" || composeState === "saving"
? "times" ? "xmark"
: "chevron-down"; : "chevron-down";
} }

2
app/assets/javascripts/discourse/app/components/create-topic-button.hbs
View File

@ -13,7 +13,7 @@
<:tooltip> <:tooltip>
{{#if @disabled}} {{#if @disabled}}
<DTooltip <DTooltip
@icon="info-circle" @icon="circle-info"
@content={{i18n "topic.create_disabled_category"}} @content={{i18n "topic.create_disabled_category"}}
/> />
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/app/components/d-editor.js
View File

@ -150,7 +150,7 @@ class Toolbar {
this.addButton({ this.addButton({
id: "toggle-direction", id: "toggle-direction",
group: "extras", group: "extras",
icon: "exchange-alt", icon: "right-left",
shortcut: "Shift+6", shortcut: "Shift+6",
title: "composer.toggle_direction", title: "composer.toggle_direction",
preventFocus: true, preventFocus: true,

2
app/assets/javascripts/discourse/app/components/d-lightbox.js
View File

@ -180,7 +180,7 @@ export default class DLightbox extends Component {
} }
get zoomButtonIcon() { get zoomButtonIcon() {
return this.isZoomed ? "search-minus" : "search-plus"; return this.isZoomed ? "magnifying-glass-minus" : "magnifying-glass-plus";
} }
@bind @bind

2
app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
View File

@ -23,7 +23,7 @@
<DButton <DButton
{{on "click" @reloadImage passive=true capture=true}} {{on "click" @reloadImage passive=true capture=true}}
@title="experimental_lightbox.buttons.redo" @title="experimental_lightbox.buttons.redo"
@icon="redo" @icon="arrow-rotate-right"
class="d-lightbox__retry-button btn-flat" class="d-lightbox__retry-button btn-flat"
/> />
<span>{{i18n "experimental_lightbox.image_load_error"}}</span> <span>{{i18n "experimental_lightbox.image_load_error"}}</span>

2
app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
View File

@ -29,7 +29,7 @@
<DButton <DButton
{{on "click" @rotateImage passive=true capture=true}} {{on "click" @rotateImage passive=true capture=true}}
@title="experimental_lightbox.buttons.rotate" @title="experimental_lightbox.buttons.rotate"
@icon="redo" @icon="arrow-rotate-right"
@ariaHidden="true" @ariaHidden="true"
aria-hidden="true" aria-hidden="true"
class="d-lightbox__rotate-button btn-flat" class="d-lightbox__rotate-button btn-flat"

4
app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
View File

@ -27,7 +27,7 @@
<DButton <DButton
{{on "click" @openInNewTab passive=true capture=true}} {{on "click" @openInNewTab passive=true capture=true}}
@title="experimental_lightbox.buttons.newtab" @title="experimental_lightbox.buttons.newtab"
@icon="external-link-alt" @icon="up-right-from-square"
@ariaHidden="true" @ariaHidden="true"
aria-hidden="true" aria-hidden="true"
class="d-lightbox__new-tab-button btn-flat" class="d-lightbox__new-tab-button btn-flat"
@ -46,7 +46,7 @@
<DButton <DButton
{{on "click" @close passive=true capture=true}} {{on "click" @close passive=true capture=true}}
@title="experimental_lightbox.buttons.close" @title="experimental_lightbox.buttons.close"
@icon="times" @icon="xmark"
@ariaHidden="true" @ariaHidden="true"
class="d-lightbox__close-button btn-flat" class="d-lightbox__close-button btn-flat"
/> />

2
app/assets/javascripts/discourse/app/components/d-modal.gjs
View File

@ -350,7 +350,7 @@ export default class DModal extends Component {
</div> </div>
{{else if this.dismissable}} {{else if this.dismissable}}
<DButton <DButton
@icon="times" @icon="xmark"
@action={{this.handleCloseButton}} @action={{this.handleCloseButton}}
@title="modal.close" @title="modal.close"
class="btn-transparent modal-close" class="btn-transparent modal-close"

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