From a914d3230bd53950677324ecc328d6c7a98167aa Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 13 Sep 2024 11:50:52 -0400 Subject: [PATCH] DEV: remap all core icons for fontawesome 6 upgrade (#28715) Followup to 7d8974d02f7360b324b446868463e950fe92883f Co-authored-by: David Taylor --- .../components/admin-backups-actions.gjs | 4 +-- .../addon/components/admin-editable-field.hbs | 2 +- .../addon/components/admin-flag-item.gjs | 4 +-- .../addon/components/admin-flags-form.gjs | 2 +- .../components/admin-plugins-list-item.gjs | 2 +- .../components/admin-report-storage-stats.hbs | 2 +- .../admin/addon/components/admin-report.hbs | 12 +++---- .../admin-site-settings-filter-controls.gjs | 2 +- .../addon/components/admin-theme-editor.hbs | 10 +++--- .../components/admin-user-field-item.hbs | 6 ++-- .../addon/components/admin-watched-word.gjs | 2 +- .../components/dashboard-period-selector.gjs | 2 +- .../addon/components/dashboard-problems.hbs | 4 +-- .../addon/components/embeddable-host.hbs | 6 ++-- .../addon/components/emoji-value-list.hbs | 2 +- .../addon/components/form-template/form.hbs | 6 ++-- .../addon/components/form-template/form.js | 6 ++-- .../components/form-template/row-item.hbs | 4 +-- .../addon/components/inline-edit-checkbox.hbs | 2 +- .../admin/addon/components/ip-lookup.hbs | 4 +-- .../addon/components/modal/badge-preview.hbs | 2 +- .../components/modal/custom-date-range.hbs | 2 +- .../modal/delete-posts-confirmation.hbs | 2 +- .../components/modal/edit-badge-groupings.hbs | 4 +-- .../modal/merge-users-confirmation.hbs | 2 +- .../components/modal/merge-users-prompt.hbs | 2 +- .../components/modal/uploaded-image-list.hbs | 2 +- .../schema-theme-setting/editor.gjs | 2 +- .../addon/components/secret-value-list.hbs | 2 +- .../components/setting-validation-message.hbs | 2 +- .../admin/addon/components/simple-list.hbs | 2 +- .../admin/addon/components/site-setting.hbs | 6 ++-- .../components/theme-settings-editor.hbs | 2 +- .../addon/components/themes-list-item.gjs | 4 +-- .../admin/addon/components/themes-list.hbs | 4 +-- .../admin/addon/components/value-list.hbs | 2 +- .../admin/addon/components/version-checks.hbs | 10 +++--- .../admin/addon/components/webhook-event.hbs | 4 +-- .../admin/addon/components/webhook-event.js | 8 ++--- .../admin/addon/components/webhook-events.hbs | 2 +- .../admin/addon/components/webhook-status.gjs | 2 +- .../addon/controllers/admin-user-index.js | 4 +-- .../admin/addon/helpers/check-icon.js | 2 +- .../admin/addon/helpers/disposition-icon.js | 2 +- .../admin/addon/mixins/setting-component.js | 4 +-- .../javascripts/admin/addon/models/report.js | 4 +-- .../javascripts/admin/addon/models/theme.js | 8 ++--- .../routes/admin-customize-themes-index.js | 2 +- .../admin/addon/services/admin-tools.js | 2 +- .../admin/addon/templates/admin-badges.hbs | 2 +- .../addon/templates/admin-badges/award.hbs | 6 ++-- .../addon/templates/admin-badges/show.hbs | 6 ++-- .../admin/addon/templates/api-keys-index.hbs | 6 ++-- .../admin/addon/templates/api-keys-new.hbs | 2 +- .../admin/addon/templates/api-keys-show.hbs | 14 ++++---- .../admin/addon/templates/backups-index.hbs | 6 ++-- .../addon/templates/customize-colors-show.hbs | 2 +- .../addon/templates/customize-colors.hbs | 2 +- .../addon/templates/customize-robots-txt.hbs | 2 +- .../addon/templates/customize-themes-show.hbs | 22 ++++++------- .../admin/addon/templates/email-bounced.hbs | 2 +- .../addon/templates/email-preview-digest.hbs | 6 +++- .../admin/addon/templates/email-rejected.hbs | 2 +- .../admin/addon/templates/email-sent.hbs | 2 +- .../admin/addon/templates/emojis.hbs | 2 +- .../templates/logs/screened-ip-addresses.hbs | 4 +-- .../templates/logs/staff-action-logs.hbs | 14 ++++---- .../admin/addon/templates/permalinks.hbs | 4 +-- .../admin/addon/templates/plugins-index.hbs | 2 +- .../admin/addon/templates/site-text-index.hbs | 2 +- .../admin/addon/templates/user-index.hbs | 30 ++++++++--------- .../addon/templates/user-tl3-requirements.hbs | 6 ++-- .../admin/addon/templates/users-list-show.hbs | 4 +-- .../addon/templates/watched-words-action.hbs | 2 +- .../admin/addon/templates/web-hooks-index.hbs | 4 +-- .../admin/addon/templates/web-hooks-show.hbs | 4 +-- .../addon/components/dialog-holder.gjs | 2 +- .../discourse/app/components/about-page.gjs | 10 +++--- .../app/components/actions-summary.gjs | 2 +- .../app/components/activation-controls.gjs | 2 +- .../app/components/admin-post-menu.gjs | 10 +++--- .../app/components/auth-token-dropdown.js | 4 +-- .../components/bookmark-actions-dropdown.js | 6 ++-- .../app/components/bookmark-list.hbs | 6 ++-- .../app/components/bookmark-menu.gjs | 8 ++--- .../components/bulk-group-member-dropdown.js | 8 ++--- .../bulk-select-topics-dropdown.gjs | 6 ++-- .../app/components/categories-boxes-topic.js | 2 +- .../components/category-permission-row.gjs | 8 ++--- .../app/components/composer-container.hbs | 16 ++++----- .../app/components/composer-editor.js | 2 +- .../components/composer-tip-close-button.hbs | 2 +- .../app/components/composer-toggles.js | 2 +- .../app/components/create-topic-button.hbs | 2 +- .../discourse/app/components/d-editor.js | 2 +- .../discourse/app/components/d-lightbox.js | 2 +- .../app/components/d-lightbox/body.hbs | 2 +- .../app/components/d-lightbox/footer.hbs | 2 +- .../app/components/d-lightbox/header.hbs | 4 +-- .../discourse/app/components/d-modal.gjs | 2 +- .../discourse/app/components/d-navigation.hbs | 2 +- .../app/components/date-time-input.hbs | 2 +- .../dialog-messages/group-delete.hbs | 2 +- .../app/components/discourse-banner.hbs | 4 +-- .../discovery/filter-navigation.hbs | 2 +- .../app/components/edit-category-general.hbs | 4 +-- .../app/components/edit-category-tags.hbs | 2 +- .../app/components/edit-topic-timer-form.hbs | 2 +- .../app/components/email-dropdown.js | 4 +-- .../discourse/app/components/emoji-picker.hbs | 4 +-- .../discourse/app/components/fast-edit.gjs | 2 +- .../app/components/future-date-input.hbs | 2 +- .../app/components/global-notice.hbs | 2 +- .../components/group-imap-email-settings.hbs | 4 +-- .../components/group-manage-logs-filter.hbs | 2 +- .../app/components/group-member-dropdown.js | 8 ++--- .../discourse/app/components/group-member.hbs | 2 +- .../components/group-membership-button.hbs | 2 +- .../components/group-smtp-email-settings.gjs | 2 +- .../groups-form-interaction-fields.hbs | 2 +- .../components/header/home-logo-contents.gjs | 2 +- .../discourse/app/components/header/icons.gjs | 2 +- .../components/header/topic/featured-link.gjs | 2 +- .../app/components/ignored-user-list-item.hbs | 2 +- .../discourse/app/components/input-tip.gjs | 2 +- .../app/components/login-buttons.hbs | 2 +- .../app/components/modal/auth-token.hbs | 2 +- .../app/components/modal/avatar-selector.hbs | 2 +- .../app/components/modal/bookmark.hbs | 4 +-- .../app/components/modal/create-account.hbs | 2 +- .../modal/customize-form-template-view.hbs | 4 +-- .../app/components/modal/discard-draft.gjs | 2 +- .../discourse/app/components/modal/flag.hbs | 6 ++-- .../app/components/modal/forgot-password.hbs | 2 +- .../discourse/app/components/modal/history.js | 2 +- .../app/components/modal/history/revision.hbs | 10 +++--- .../components/modal/history/revisions.hbs | 2 +- .../components/modal/history/topic-footer.hbs | 10 +++--- .../components/modal/json-schema-editor.js | 2 +- .../modal/login/local-login-form.hbs | 2 +- .../app/components/modal/move-to-topic.hbs | 2 +- .../app/components/modal/publish-page.hbs | 4 +-- .../modal/reject-reason-reviewable.hbs | 2 +- .../modal/second-factor-backup-edit.hbs | 2 +- .../components/modal/sidebar-section-form.hbs | 6 ++-- .../components/modal/spreadsheet-editor.gjs | 4 +-- .../app/components/modal/user-status.hbs | 2 +- .../notification-consent-banner.gjs | 2 +- .../app/components/popup-input-tip.hbs | 2 +- .../post-text-selection-toolbar.gjs | 2 +- .../app/components/pwa-install-banner.gjs | 2 +- .../components/reviewable-claimed-topic.gjs | 2 +- .../app/components/reviewable-created-by.gjs | 2 +- .../app/components/reviewable-item.hbs | 6 ++-- .../app/components/reviewable-post-edits.hbs | 2 +- .../app/components/reviewable-queued-post.hbs | 2 +- .../components/search-advanced-options.hbs | 6 ++-- .../discourse/app/components/search-menu.hbs | 4 +-- .../search-menu/advanced-button.hbs | 2 +- .../components/search-menu/clear-button.hbs | 2 +- .../search-menu/results/assistant-item.hbs | 2 +- .../search-menu/results/assistant-item.js | 2 +- .../search-menu/results/recent-searches.hbs | 4 +-- .../app/components/security-key-dropdown.js | 4 +-- .../app/components/selected-posts.hbs | 6 ++-- .../sidebar/edit-navigation-menu/modal.gjs | 4 +-- .../app/components/sidebar/filter.gjs | 2 +- .../app/components/sidebar/footer.gjs | 2 +- .../components/sidebar/more-section-links.gjs | 2 +- .../components/sidebar/section-form-link.gjs | 2 +- .../app/components/sidebar/section.gjs | 2 +- .../sidebar/toggle-all-sections.gjs | 2 +- .../sidebar/user/categories-section.gjs | 2 +- .../components/sidebar/user/tags-section.gjs | 2 +- .../app/components/slow-mode-info.hbs | 2 +- .../app/components/software-update-prompt.gjs | 4 +-- .../app/components/tag-groups-form.hbs | 2 +- .../discourse/app/components/tag-info.hbs | 12 +++---- .../app/components/tags-admin-dropdown.js | 2 +- .../app/components/time-shortcut-picker.hbs | 2 +- .../components/token-based-auth-dropdown.js | 4 +-- .../app/components/topic-admin-menu.gjs | 8 ++--- .../app/components/topic-entrance.hbs | 4 +-- .../components/topic-list/topic-entrance.gjs | 4 +-- .../topic-list/topic-list-header-column.gjs | 2 +- .../topic-list/topic-list-header.gjs | 2 +- .../topic-map/private-message-map.gjs | 4 +-- .../topic-map/topic-map-summary.gjs | 2 +- .../app/components/topic-navigation-popup.hbs | 2 +- .../app/components/topic-timer-info.hbs | 4 +-- .../components/two-factor-backup-dropdown.js | 4 +-- .../app/components/uppy-image-uploader.hbs | 2 +- .../app/components/user-card-contents.hbs | 6 ++-- .../app/components/user-flag-percentage.js | 2 +- .../user-menu/profile-tab-content.hbs | 8 ++--- .../discourse/app/components/user-nav.hbs | 4 +-- .../passkey-options-dropdown.js | 4 +-- .../app/components/user-stream-item.hbs | 6 ++-- .../app/components/username-preference.gjs | 2 +- .../discourse/app/controllers/exception.js | 2 +- .../app/controllers/preferences/account.js | 2 +- .../discourse/app/controllers/user.js | 4 +-- .../form-kit/components/fk/errors-summary.gjs | 2 +- .../app/form-kit/components/fk/errors.gjs | 2 +- .../helpers/reviewable-history-description.js | 2 +- .../app/helpers/reviewable-status.js | 10 +++--- .../discourse/app/helpers/user-status.js | 4 +-- .../app/instance-initializers/enable-emoji.js | 2 +- .../app/instance-initializers/logout.js | 2 +- .../instance-initializers/post-decorations.js | 2 +- .../video-placeholder.js | 2 +- .../discourse/app/lib/autocomplete.js | 2 +- .../lib/notification-types/admin-problems.js | 2 +- .../discourse/app/lib/plugin-api.gjs | 22 ++++++------- .../app/lib/render-topic-featured-link.js | 4 +-- .../app/lib/sidebar/admin-nav-map.js | 24 +++++++------- .../app/lib/sidebar/admin-sidebar.js | 6 ++-- .../community-section/about-section-link.js | 2 +- .../community-section/faq-section-link.js | 2 +- .../community-section/groups-section-link.js | 2 +- .../app/lib/sidebar/custom-sections.js | 2 +- .../discourse/app/lib/sidebar/section.js | 2 +- .../user/community-section/admin-section.js | 2 +- .../my-posts-section-link.js | 2 +- .../discourse/app/lib/time-shortcut.js | 8 ++--- .../discourse/app/models/composer.js | 2 +- .../discourse/app/models/user-action.js | 2 +- .../topic-list-header-column.hbr | 2 +- .../app/raw-templates/topic-list-header.hbr | 2 +- .../app/routes/user-activity-read.js | 2 +- .../discourse/app/services/composer.js | 2 +- .../discourse/app/templates/badges/show.hbs | 2 +- .../app/templates/edit-category-tabs.hbs | 4 +-- .../discourse/app/templates/exception.hbs | 2 +- .../app/templates/full-page-search.hbs | 4 +-- .../discourse/app/templates/group-index.hbs | 4 +-- .../discourse/app/templates/group.hbs | 6 ++-- .../discourse/app/templates/groups/index.hbs | 2 +- .../discourse/app/templates/invites/show.hbs | 2 +- .../app/templates/password-reset.hbs | 2 +- .../app/templates/preferences/account.hbs | 10 +++--- .../app/templates/preferences/interface.hbs | 2 +- .../app/templates/preferences/security.hbs | 2 +- .../discourse/app/templates/review-index.hbs | 4 +-- .../discourse/app/templates/topic.hbs | 10 +++--- .../app/templates/user-invited-show.hbs | 8 ++--- .../templates/user-private-messages-group.hbs | 6 ++-- .../templates/user-private-messages-user.hbs | 6 ++-- .../discourse/app/templates/user.hbs | 4 +-- .../discourse/app/templates/user/activity.hbs | 6 ++-- .../app/templates/user/bookmarks.hbs | 6 +++- .../app/templates/user/notifications.hbs | 2 +- .../discourse/app/widgets/post-cooked.js | 2 +- .../app/widgets/post-edits-indicator.js | 4 +-- .../discourse/app/widgets/post-menu.js | 18 +++++----- .../app/widgets/post-small-action.js | 22 ++++++------- .../discourse/app/widgets/post-stream.js | 2 +- .../javascripts/discourse/app/widgets/post.js | 6 ++-- .../discourse/app/widgets/poster-name.js | 2 +- .../discourse/app/widgets/widget-dropdown.js | 2 +- .../acceptance/admin-sidebar-section-test.js | 10 +++--- .../acceptance/category-edit-security-test.js | 6 ++-- .../tests/acceptance/composer-actions-test.js | 2 +- .../acceptance/composer-draft-saving-test.js | 2 +- .../tests/acceptance/composer-test.js | 12 +++---- .../tests/acceptance/group-index-test.js | 2 +- .../group-manage-email-settings-test.js | 2 +- .../acceptance/sidebar-plugin-api-test.js | 14 ++++---- .../tests/acceptance/sidebar-user-test.js | 4 ++- .../topic-footer-button-api-mobile-test.js | 2 +- .../topic-footer-button-api-test.js | 8 ++--- .../discourse/tests/acceptance/topic-test.js | 12 +++---- .../tests/acceptance/user-menu-test.js | 6 ++-- .../tests/acceptance/user-status-test.js | 2 +- .../discourse/tests/acceptance/user-test.js | 2 +- .../tests/fixtures/badges-fixture.js | 2 +- .../tests/fixtures/group-fixtures.js | 6 ++-- .../tests/fixtures/session-fixtures.js | 6 ++-- .../discourse/tests/fixtures/site-fixtures.js | 6 ++-- .../tests/helpers/review-pretender.js | 4 +-- .../components/admin-page-header-test.gjs | 2 +- .../components/admin-page-subheader-test.gjs | 2 +- .../components/badge-button-test.js | 4 +-- .../integration/components/d-editor-test.js | 8 ++--- .../components/dialog-holder-test.js | 2 +- .../float-kit/d-default-toast-test.js | 2 +- .../components/float-kit/d-menu-test.js | 4 +-- .../form-kit/controls/icon-test.gjs | 8 ++--- .../components/form-kit/layout/alert-test.gjs | 4 +-- .../integration/components/home-logo-test.gjs | 2 +- .../components/select-kit/combo-box-test.js | 4 +-- .../select-kit/dropdown-select-box-test.js | 2 +- .../select-kit/single-select-test.js | 2 +- .../components/themes-list-item-test.js | 8 +++-- .../components/uppy-image-uploader-test.js | 12 ++----- .../components/user-avatar-flair-test.js | 4 +-- .../components/webhook-status-test.gjs | 2 +- .../widgets/actions-summary-test.js | 2 +- .../components/widgets/button-test.js | 7 ++-- .../components/widgets/post-menu-test.js | 4 +-- .../components/widgets/post-stream-test.js | 2 +- .../components/widgets/poster-name-test.js | 2 +- .../components/widgets/topic-status-test.js | 4 +-- .../widgets/widget-dropdown-test.js | 8 ++--- .../tests/unit/lib/icon-library-test.js | 33 ++++++++++--------- .../addon/components/d-default-toast.gjs | 2 +- .../float-kit/addon/services/toasts.js | 6 ++-- .../bulk-select-bookmarks-dropdown.js | 2 +- .../components/categories-admin-dropdown.js | 2 +- .../category-drop-more-collection.gjs | 4 +-- .../components/combo-box/combo-box-header.hbs | 2 +- .../addon/components/composer-actions.js | 2 +- .../mini-tag-chooser/selected-collection.hbs | 2 +- .../multi-select/selected-category.hbs | 2 +- .../select-kit/addon/components/select-kit.js | 2 +- .../addon/components/selected-choice.hbs | 2 +- .../addon/components/selected-name.hbs | 2 +- .../stylesheets/common/admin/admin_base.scss | 2 +- .../stylesheets/common/admin/dashboard.scss | 2 +- .../stylesheets/common/base/compose.scss | 2 +- .../common/base/edit-category.scss | 6 ++-- .../stylesheets/common/base/exception.scss | 2 +- .../stylesheets/common/base/header.scss | 2 +- app/assets/stylesheets/common/base/rtl.scss | 4 +-- .../stylesheets/common/base/search-menu.scss | 2 +- .../common/base/sidebar-section.scss | 2 +- .../common/components/user-stream-item.scss | 2 +- app/assets/stylesheets/common/d-editor.scss | 2 +- .../common/form-kit/_errors-summary.scss | 2 +- .../common/select-kit/select-kit.scss | 2 +- app/models/concerns/reports/users_by_type.rb | 4 +-- app/models/reviewable.rb | 4 +-- app/models/reviewable_flagged_post.rb | 12 +++---- app/models/reviewable_post.rb | 6 ++-- app/models/reviewable_queued_post.rb | 4 +-- app/models/sidebar_url.rb | 6 ++-- app/views/static/show.html.erb | 2 +- db/fixtures/006_badges.rb | 10 +++--- lib/reviewable/actions.rb | 2 +- .../components/fields/da-date-time-field.gjs | 2 +- .../admin/components/fields/da-pms-field.gjs | 2 +- .../helpers/format-enabled-automation.js | 2 +- ...min-plugins-discourse-automation-index.hbs | 2 +- .../app/models/chat/reviewable_message.rb | 6 ++-- .../discourse/components/browse-channels.gjs | 2 +- .../components/channels-list-public.gjs | 2 +- .../components/chat-channel-leave-btn.gjs | 2 +- .../discourse/components/chat-channel-row.gjs | 4 +-- .../chat-composer-message-details.gjs | 4 +-- .../components/chat-composer-upload.gjs | 4 +-- .../components/chat-emoji-picker.hbs | 2 +- .../components/chat-mention-warnings.gjs | 2 +- .../chat-message-actions-desktop.gjs | 2 +- .../discourse/components/chat-notice.gjs | 2 +- .../components/chat-retention-reminder.gjs | 2 +- .../discourse/components/chat/header/icon.gjs | 2 +- .../components/chat/message-creator/group.gjs | 2 +- .../chat/message-creator/member.gjs | 4 +-- .../chat/message-creator/members-selector.gjs | 2 +- .../chat/message-creator/members.gjs | 2 +- .../chat/message-creator/search-input.gjs | 2 +- .../chat/message-creator/search.gjs | 2 +- .../components/chat/message/error.gjs | 2 +- .../components/chat/modal/create-channel.hbs | 2 +- .../chat/modal/delete-messages-confirm.gjs | 2 +- .../chat/modal/edit-channel-name.gjs | 2 +- .../chat/modal/move-message-to-channel.gjs | 2 +- .../components/chat/modal/thread-settings.gjs | 2 +- .../chat/navbar/browse-channels-button.gjs | 2 +- .../chat/navbar/close-drawer-button.gjs | 2 +- .../chat/navbar/close-thread-button.gjs | 2 +- .../chat/navbar/close-threads-button.gjs | 2 +- .../chat/navbar/thread-settings-button.gjs | 2 +- .../chat/navbar/toggle-drawer-button.gjs | 4 +-- .../chat/routes/channel-info-members.gjs | 2 +- .../chat/routes/channel-info-settings.gjs | 10 +++--- .../components/chat/selection-manager.gjs | 6 ++-- .../discourse/initializers/chat-setup.js | 4 +-- .../discourse/initializers/chat-sidebar.js | 4 +-- .../discourse/lib/chat-message-interactor.js | 10 +++--- .../common/chat-message-creator.scss | 10 +++--- .../page_objects/chat/components/header.rb | 2 +- .../components/chat-composer-dropdown-test.js | 4 +-- .../chat-composer-message-details-test.js | 2 +- .../components/chat-composer-upload-test.js | 2 +- .../components/chat-header-icon-test.js | 4 +-- .../unit/lib/chat-composer-buttons-test.js | 2 +- .../lib/discourse-markdown/checklist.js | 8 ++--- .../assets/stylesheets/checklist.scss | 2 +- plugins/checklist/spec/pretty_text_spec.rb | 2 +- .../components/modal/local-dates-create.hbs | 10 +++--- .../initializers/discourse-local-dates.js | 2 +- .../initializers/inline-footnotes.js | 2 +- plugins/footnote/plugin.rb | 2 +- .../components/modal/poll-ui-builder.hbs | 4 +-- .../components/poll-buttons-dropdown.gjs | 4 +-- .../discourse/components/poll-info.gjs | 2 +- .../discourse/components/poll-options.gjs | 4 +-- .../javascripts/discourse/components/poll.gjs | 2 +- plugins/poll/plugin.rb | 2 +- .../component/poll-options-test.js | 2 +- .../javascripts/initializers/spoiler-alert.js | 2 +- .../components/sections/atoms/02-buttons.hbs | 12 +++---- .../components/sections/atoms/05-forms.hbs | 2 +- .../sections/organisms/user-about.hbs | 20 +++++------ spec/requests/groups_controller_spec.rb | 16 ++++----- .../sidebar_sections_controller_spec.rb | 12 +++---- spec/system/admin_badges_spec.rb | 2 +- spec/system/admin_embeddable_hosts_spec.rb | 5 +-- spec/system/private_message_map_spec.rb | 2 +- 410 files changed, 840 insertions(+), 831 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs b/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs index 5f4d4b2e370..a6abf5a5346 100644 --- a/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs @@ -56,7 +56,7 @@ export default class AdminBackupsActions extends Component { @action={{routeAction "cancelOperation"}} @title="admin.backups.operations.cancel.title" @label="admin.backups.operations.cancel.label" - @icon="times" + @icon="xmark" class="admin-backups__cancel" /> {{else}} @@ -74,7 +74,7 @@ export default class AdminBackupsActions extends Component { @action={{routeAction "rollback"}} @label="admin.backups.operations.rollback.label" @title="admin.backups.operations.rollback.title" - @icon="ambulance" + @icon="truck-medical" @disabled={{this.rollbackDisabled}} class="admin-backups__rollback" /> diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs index efee39772d0..4db9c679992 100644 --- a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs +++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs @@ -21,6 +21,6 @@ /> {{i18n "cancel"}} {{else}} - + {{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs index 8f0cbdae58b..1bb8ea51716 100644 --- a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs @@ -148,7 +148,7 @@ export default class AdminFlagItem extends Component { <:content> @@ -177,7 +177,7 @@ export default class AdminFlagItem extends Component { - + {{i18n "admin.config_areas.flags.form.alert"}} diff --git a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs index 284c4343cdc..37fb9365575 100644 --- a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs @@ -97,7 +97,7 @@ export default class AdminPluginsListItem extends Component { target="_blank" > {{i18n "admin.plugins.learn_more"}} - {{icon "external-link-alt"}} + {{icon "up-right-from-square"}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs index 8a88ac72e45..eb885e4ff47 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs +++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs @@ -1,7 +1,7 @@ {{#if this.showBackupStats}}

- {{d-icon "archive"}} + {{d-icon "box-archive"}} {{i18n "admin.dashboard.backups"}}

diff --git a/app/assets/javascripts/admin/addon/components/admin-report.hbs b/app/assets/javascripts/admin/addon/components/admin-report.hbs index f13e0c7d6a2..6217cd62c5d 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report.hbs +++ b/app/assets/javascripts/admin/addon/components/admin-report.hbs @@ -28,7 +28,7 @@ @interactive={{this.model.description_link.length}} > <:trigger> - {{d-icon "question-circle"}} + {{d-icon "circle-question"}} <:content> {{#if this.model.description_link}} @@ -78,21 +78,21 @@ {{#if this.showError}} {{#if this.showTimeoutError}}

- {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.dashboard.timeout_error"}}
{{/if}} {{#if this.showExceptionError}}
- {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.dashboard.exception_error"}}
{{/if}} {{#if this.showNotFoundError}}
- {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.dashboard.not_found_error"}}
{{/if}} @@ -115,7 +115,7 @@ {{else}} {{#if this.rateLimitationString}}
- {{d-icon "thermometer-three-quarters"}} + {{d-icon "temperature-three-quarters"}} {{this.rateLimitationString}}
{{else}} @@ -228,7 +228,7 @@
diff --git a/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs b/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs index 44fdb370813..e6d1a3b17ac 100644 --- a/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs @@ -65,7 +65,7 @@ export default class AdminSiteSettingsFilterControls extends Component { {{#if @showMenu}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs index d5437664c3e..effaf57c4ec 100644 --- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs +++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs @@ -10,7 +10,7 @@ title={{this.field.title}} 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}} {{i18n (concat "admin.customize.theme." target.name)}} @@ -30,9 +30,7 @@ }} class="no-text" > - {{d-icon - (if this.showAdvanced "angle-double-left" "angle-double-right") - }} + {{d-icon (if this.showAdvanced "angles-left" "angles-right")}} {{/if}} @@ -66,7 +64,7 @@ title={{field.title}} 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}} {{field.translatedName}} @@ -89,7 +87,7 @@ /> {{else}} diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs index 82e174efe77..a2417599637 100644 --- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs +++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs @@ -114,7 +114,7 @@ /> @@ -132,13 +132,13 @@
diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs b/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs index f60982e7700..1ebe82e9b20 100644 --- a/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs @@ -30,7 +30,7 @@ export default class AdminWatchedWord extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs b/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs index e9bdf69b623..d34b737c896 100644 --- a/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs +++ b/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs @@ -30,7 +30,7 @@ export default class DashboardPeriodSelector extends Component { @fullDay={{false}} /> - {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{html-safe problem.message}} {{/each}} @@ -45,7 +45,7 @@

diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs index f0a7d06f687..eb52efd31e7 100644 --- a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs +++ b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs @@ -53,7 +53,7 @@ class="btn-primary" /> - - + + {{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs index 1be68d11178..8562b1cd92d 100644 --- a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs +++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs @@ -4,7 +4,7 @@

  • diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.hbs b/app/assets/javascripts/admin/addon/components/form-template/form.hbs index d9b719cd823..83763e7a8aa 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/form.hbs +++ b/app/assets/javascripts/admin/addon/components/form-template/form.hbs @@ -25,7 +25,7 @@ {{/each}} @@ -58,14 +58,14 @@ {{#if this.isEditing}} diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.js b/app/assets/javascripts/admin/addon/components/form-template/form.js index 49b7553c353..9f8d36d8efe 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/form.js +++ b/app/assets/javascripts/admin/addon/components/form-template/form.js @@ -22,7 +22,7 @@ export default class FormTemplateForm extends Component { quickInsertFields = [ { type: "checkbox", - icon: "check-square", + icon: "square-check", }, { type: "input", @@ -34,11 +34,11 @@ export default class FormTemplateForm extends Component { }, { type: "dropdown", - icon: "chevron-circle-down", + icon: "circle-chevron-down", }, { type: "upload", - icon: "cloud-upload-alt", + icon: "cloud-arrow-up", }, { type: "multiselect", diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs index 1ffbcfd6a0d..a6f2e58b804 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs +++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs @@ -14,13 +14,13 @@ /> diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs index 9e2d6948008..4b9108c896e 100644 --- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs +++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs @@ -10,7 +10,7 @@ /> {{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs index 1097e54a84a..bcae14a51e8 100644 --- a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs +++ b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs @@ -9,7 +9,7 @@ {{#if this.show}}
    {{d-icon - "times" + "xmark" }} {{#if this.copied}}

    - {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.badges.preview.bad_count_warning.header"}}

    diff --git a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs index 902358aeaa6..8376d1a84b5 100644 --- a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs +++ b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs @@ -16,7 +16,7 @@ \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs index 8d8680d9b62..b74516d3637 100644 --- a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs +++ b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs @@ -21,7 +21,7 @@ {{/if}} @@ -30,7 +30,7 @@

    • diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs index a43371867b5..dd37f653309 100644 --- a/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs +++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs @@ -21,7 +21,7 @@ {{bound-avatar-template image "huge"}} {{d-icon - "times-circle" + "circle-xmark" }} {{else}} diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs index a0fbfb4a666..0d769ac4b73 100644 --- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs +++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs @@ -308,7 +308,7 @@ export default class SchemaThemeSettingNewEditor extends Component { {{#if (gt this.fields.length 0)}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs index 9203ebc14dd..544d51ab89f 100644 --- a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs +++ b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs @@ -4,7 +4,7 @@
    - {{d-icon "times"}} + {{d-icon "xmark"}} {{this.message}}
    \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs index 277d8b5e5b6..958d11ea7df 100644 --- a/app/assets/javascripts/admin/addon/components/simple-list.hbs +++ b/app/assets/javascripts/admin/addon/components/simple-list.hbs @@ -4,7 +4,7 @@
    diff --git a/app/assets/javascripts/admin/addon/components/site-setting.hbs b/app/assets/javascripts/admin/addon/components/site-setting.hbs index c8047733e6b..67f37c2325a 100644 --- a/app/assets/javascripts/admin/addon/components/site-setting.hbs +++ b/app/assets/javascripts/admin/addon/components/site-setting.hbs @@ -9,7 +9,7 @@ title={{i18n "admin.settings.history"}} > - {{d-icon "history"}} + {{d-icon "clock-rotate-left"}} {{/if}} @@ -62,7 +62,7 @@ />
    @@ -78,7 +78,7 @@ {{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs index 3a74647fdca..f35651f8b74 100644 --- a/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs +++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs @@ -8,7 +8,7 @@ {{#each this.errors as |error|}}
    - {{d-icon "times"}} + {{d-icon "xmark"}} {{error.setting}}: {{error.errorMessage}}
    diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs index eca7738d754..f41ab0698a5 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs +++ b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs @@ -117,14 +117,14 @@ export default class ThemesListItem extends Component { {{/if}} {{#if @theme.isPendingUpdates}} {{icon - "sync" + "arrows-rotate" title="admin.customize.theme.updates_available_tooltip" class="light-grey-icon" }} {{/if}} {{#if @theme.isBroken}} {{icon - "exclamation-circle" + "circle-exclamation" class="broken-indicator" title="admin.customize.theme.broken_theme_tooltip" }} diff --git a/app/assets/javascripts/admin/addon/components/themes-list.hbs b/app/assets/javascripts/admin/addon/components/themes-list.hbs index 4792658a8ec..20a706d651a 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list.hbs +++ b/app/assets/javascripts/admin/addon/components/themes-list.hbs @@ -25,7 +25,7 @@ @type="search" @value={{mut this.searchTerm}} /> - {{d-icon "search"}} + {{d-icon "magnifying-glass"}}
    @@ -101,7 +101,7 @@ @action={{this.deleteConfirmation}} @disabled={{eq this.selectedCount 0}} > - {{d-icon "trash-alt"}} + {{d-icon "trash-can"}} Delete {{/if}} diff --git a/app/assets/javascripts/admin/addon/components/value-list.hbs b/app/assets/javascripts/admin/addon/components/value-list.hbs index 8141649028e..45fa5a6d461 100644 --- a/app/assets/javascripts/admin/addon/components/value-list.hbs +++ b/app/assets/javascripts/admin/addon/components/value-list.hbs @@ -4,7 +4,7 @@
    diff --git a/app/assets/javascripts/admin/addon/components/version-checks.hbs b/app/assets/javascripts/admin/addon/components/version-checks.hbs index 20fac751b69..2e7ba134339 100644 --- a/app/assets/javascripts/admin/addon/components/version-checks.hbs +++ b/app/assets/javascripts/admin/addon/components/version-checks.hbs @@ -41,7 +41,7 @@
    - {{d-icon "far-frown"}} + {{d-icon "far-face-frown"}}
    @@ -65,11 +65,11 @@
    {{#if this.versionCheck.version_check_pending}} - {{d-icon "far-smile"}} + {{d-icon "far-face-smile"}} {{else}} - {{d-icon "far-frown"}} + {{d-icon "far-face-frown"}} {{/if}}
    @@ -96,7 +96,7 @@
    {{#if this.versionCheck.upToDate}} - {{d-icon "far-smile"}} + {{d-icon "far-face-smile"}} {{else}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.hbs b/app/assets/javascripts/admin/addon/components/webhook-event.hbs index adde109518a..55cb960aad5 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-event.hbs +++ b/app/assets/javascripts/admin/addon/components/webhook-event.hbs @@ -1,7 +1,7 @@
  • {{#if @event.redelivering}} - {{d-icon "sync"}} + {{d-icon "arrows-rotate"}} {{else}} {{@event.status}} {{/if}} @@ -25,7 +25,7 @@ @label="admin.web_hooks.events.response" /> diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.js b/app/assets/javascripts/admin/addon/components/webhook-event.js index 036b38a8b72..ca16cbf3853 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-event.js +++ b/app/assets/javascripts/admin/addon/components/webhook-event.js @@ -42,14 +42,14 @@ export default class WebhookEvent extends Component { get expandRequestIcon() { return this.expandDetails === this.expandDetailsRequestKey - ? "ellipsis-h" - : "ellipsis-v"; + ? "ellipsis" + : "ellipsis-vertical"; } get expandResponseIcon() { return this.expandDetails === this.expandDetailsResponseKey - ? "ellipsis-h" - : "ellipsis-v"; + ? "ellipsis" + : "ellipsis-vertical"; } @action diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.hbs b/app/assets/javascripts/admin/addon/components/webhook-events.hbs index a6a0f5beafb..46b27bcef8e 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-events.hbs +++ b/app/assets/javascripts/admin/addon/components/webhook-events.hbs @@ -14,7 +14,7 @@ /> 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"), class: "btn-danger", action: () => { diff --git a/app/assets/javascripts/admin/addon/helpers/check-icon.js b/app/assets/javascripts/admin/addon/helpers/check-icon.js index 3acc6ecf568..7b2c29d984b 100644 --- a/app/assets/javascripts/admin/addon/helpers/check-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/check-icon.js @@ -5,6 +5,6 @@ import { renderIcon } from "discourse-common/lib/icon-library"; registerRawHelper("check-icon", checkIcon); export default function checkIcon(value) { - let icon = value ? "check" : "times"; + let icon = value ? "check" : "xmark"; return htmlSafe(renderIcon("string", icon)); } diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js index 7fc641b851e..ce0142d1471 100644 --- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js @@ -11,7 +11,7 @@ export default class DispositionIcon extends Helper { let title = "admin.flags.dispositions." + disposition; switch (disposition) { case "deferred": { - icon = "external-link-alt"; + icon = "up-right-from-square"; break; } case "agreed": { diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js index a55010df72b..8fa9c076c00 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-component.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js @@ -199,7 +199,7 @@ export default Mixin.create({ }); }, label: "admin.site_settings.json_schema.edit", - icon: "pencil-alt", + icon: "pencil", }; } else if (setting.objects_schema) { return { @@ -210,7 +210,7 @@ export default Mixin.create({ ); }, label: "admin.customize.theme.edit_objects_theme_setting", - icon: "pencil-alt", + icon: "pencil", }; } }), diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js index 09eb1a132b0..f05a620ae52 100644 --- a/app/assets/javascripts/admin/addon/models/report.js +++ b/app/assets/javascripts/admin/addon/models/report.js @@ -692,9 +692,9 @@ export default class Report extends EmberObject { case "trending-down": return higherIsBetter ? "angle-down" : "angle-up"; case "high-trending-up": - return higherIsBetter ? "angle-double-up" : "angle-double-down"; + return higherIsBetter ? "angles-up" : "angles-down"; case "high-trending-down": - return higherIsBetter ? "angle-double-down" : "angle-double-up"; + return higherIsBetter ? "angles-down" : "angles-up"; default: return "minus"; } diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js index af01ff1681d..ced9cce4fb8 100644 --- a/app/assets/javascripts/admin/addon/models/theme.js +++ b/app/assets/javascripts/admin/addon/models/theme.js @@ -37,8 +37,8 @@ class Theme extends RestModel { return [ { id: 0, name: "common" }, { id: 1, name: "desktop", icon: "desktop" }, - { id: 2, name: "mobile", icon: "mobile-alt" }, - { id: 3, name: "settings", icon: "cog", advanced: true }, + { id: 2, name: "mobile", icon: "mobile-screen-button" }, + { id: 3, name: "settings", icon: "gear", advanced: true }, { id: 4, name: "translations", @@ -49,7 +49,7 @@ class Theme extends RestModel { { id: 5, name: "extra_scss", - icon: "paint-brush", + icon: "paintbrush", advanced: true, customNames: true, }, @@ -124,7 +124,7 @@ class Theme extends RestModel { } if (fieldName.indexOf("_tag") > 0) { - field.icon = "far-file-alt"; + field.icon = "far-file-lines"; } return field; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js index ffbdb0d28de..cb8dbd620bb 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js @@ -15,7 +15,7 @@ const externalResources = [ { key: "admin.customize.theme.browse_themes", link: "https://meta.discourse.org/c/theme", - icon: "paint-brush", + icon: "paintbrush", }, ]; diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js index aaccbaae3ed..4710e500755 100644 --- a/app/assets/javascripts/admin/addon/services/admin-tools.js +++ b/app/assets/javascripts/admin/addon/services/admin-tools.js @@ -90,7 +90,7 @@ export default class AdminToolsService extends Service { message, class: "flagging-delete-spammer", confirmButtonLabel: "flagging.yes_delete_spammer", - confirmButtonIcon: "exclamation-triangle", + confirmButtonIcon: "triangle-exclamation", didConfirm: () => { return ajax(`/admin/users/${userId}.json`, { type: "DELETE", diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges.hbs index 61c5ae3c419..0183cb413bd 100644 --- a/app/assets/javascripts/admin/addon/templates/admin-badges.hbs +++ b/app/assets/javascripts/admin/addon/templates/admin-badges.hbs @@ -31,7 +31,7 @@ @action={{routeAction "editGroupings"}} @title="admin.badges.group_settings" @label="admin.badges.group_settings" - @icon="cog" + @icon="gear" class="edit-groupings-btn" /> diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs index bbf00f4d883..b53e581efd3 100644 --- a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs +++ b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs @@ -48,7 +48,7 @@ class="btn-primary" /> - {{d-icon "times"}} + {{d-icon "xmark"}} {{i18n "cancel"}} @@ -60,14 +60,14 @@ {{#if this.success}} {{d-icon "check" class="bulk-award-status-icon success"}} {{else}} - {{d-icon "times" class="bulk-award-status-icon failure"}} + {{d-icon "xmark" class="bulk-award-status-icon failure"}} {{/if}} {{this.resultsMessage}}

    {{#if this.unmatchedEntries.length}}

    {{d-icon - "exclamation-triangle" + "triangle-exclamation" class="bulk-award-status-icon failure" }} diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs index 553b604f560..67735c6bf64 100644 --- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs +++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs @@ -33,7 +33,7 @@ @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "name")}} > - {{d-icon "pencil-alt"}} + {{d-icon "pencil"}} {{else}} @@ -116,7 +116,7 @@ @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "description")}} > - {{d-icon "pencil-alt"}} + {{d-icon "pencil"}} {{else}} @@ -145,7 +145,7 @@ q=(concat this.textCustomizationPrefix "long_description") }} > - {{d-icon "pencil-alt"}} + {{d-icon "pencil"}} {{else}} diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs index 3611a65fd05..5845aab6135 100644 --- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs @@ -20,7 +20,7 @@ {{#each this.model as |k|}} - {{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}} + {{#if k.revoked_at}}{{d-icon "circle-xmark"}}{{/if}} {{k.truncatedKey}} @@ -57,13 +57,13 @@ {{#if k.revoked_at}} {{else}} diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs index 4e0fc952c6c..f5176a87d01 100644 --- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs +++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs @@ -89,7 +89,7 @@

    {{act.name}}
    - {{#if this.model.revoked_at}}{{d-icon "times-circle"}}{{/if}} + {{#if this.model.revoked_at}}{{d-icon "circle-xmark"}}{{/if}} {{this.model.truncatedKey}} @@ -31,13 +31,13 @@ {{else}} {{/if}} @@ -81,19 +81,19 @@ {{#if this.model.revoked_at}} {{else}} @@ -120,7 +120,7 @@ {{scope.action}} - {{dIcon "info-circle"}} + {{dIcon "circle-info"}} {{html-safe (i18n "admin.backups.operations.restore.is_disabled" @@ -46,14 +46,14 @@ <:content> diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs index e1687c926c8..f84a8f365ac 100644 --- a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs +++ b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs @@ -10,7 +10,7 @@ @model={{scheme}} @replace={{true}} > - {{d-icon "paint-brush"}} + {{d-icon "paintbrush"}} {{scheme.description}}
    • diff --git a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs index 433c47f3cee..2311eead180 100644 --- a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs +++ b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs @@ -15,7 +15,7 @@ > {{else}} {{this.model.name}} {{/if}} @@ -59,7 +59,7 @@ {{#if this.showRemoteError}}
    - {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.customize.theme.repo_unreachable"}}
    @@ -76,7 +76,7 @@ @@ -185,7 +185,7 @@ {{#if this.showRemoteError}}
    - {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{i18n "admin.customize.theme.repo_unreachable"}}
    @@ -203,7 +203,7 @@ {{else}} @@ -240,7 +240,7 @@ {{else}} - {{d-icon "info-circle"}} + {{d-icon "circle-info"}} {{i18n "admin.customize.theme.imported_from_archive"}} {{/if}} @@ -296,7 +296,7 @@ {{#if this.colorSchemeId}} @@ -322,7 +322,7 @@ /> {{/if}} @@ -395,7 +395,7 @@ @@ -546,7 +546,7 @@
    diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs index 110aa04bcb8..70a6286ec87 100644 --- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs +++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs @@ -61,7 +61,7 @@ {{on "click" (fn this.handleShowIncomingEmail l.id)}} title={{i18n "admin.email.details_title"}} > - {{d-icon "info-circle"}} + {{d-icon "circle-info"}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs index cde89fa060f..2a120f53f7d 100644 --- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs +++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs @@ -9,7 +9,11 @@ - {{d-icon "info-circle"}} + {{d-icon "circle-info"}} diff --git a/app/assets/javascripts/admin/addon/templates/email-sent.hbs b/app/assets/javascripts/admin/addon/templates/email-sent.hbs index bedeef4c5ce..3e4a4334a84 100644 --- a/app/assets/javascripts/admin/addon/templates/email-sent.hbs +++ b/app/assets/javascripts/admin/addon/templates/email-sent.hbs @@ -51,7 +51,7 @@ {{#if l.bounced}}{{d-icon - "redo" + "arrow-rotate-right" title="admin.email.bounced" }}{{/if}}

    diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs index b8b6e55b880..36bb4813a0a 100644 --- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs +++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs @@ -95,12 +95,12 @@ {{else}} {{#if item.isBlocked}} diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs index 54ce7a496cf..689e4e37644 100644 --- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs +++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs @@ -18,7 +18,7 @@ > {{i18n "admin.logs.action"}}: {{this.actionFilter}} - {{d-icon "times-circle"}} + {{d-icon "circle-xmark"}} {{/if}} {{#if this.filters.acting_user}} @@ -31,7 +31,7 @@ "admin.logs.staff_actions.staff_user" }}: {{this.filters.acting_user}} - {{d-icon "times-circle"}} + {{d-icon "circle-xmark"}} {{/if}} {{#if this.filters.target_user}} @@ -44,7 +44,7 @@ "admin.logs.staff_actions.target_user" }}: {{this.filters.target_user}} - {{d-icon "times-circle"}} + {{d-icon "circle-xmark"}} {{/if}} {{#if this.filters.subject}} @@ -57,7 +57,7 @@ "admin.logs.staff_actions.subject" }}: {{this.filters.subject}} - {{d-icon "times-circle"}} + {{d-icon "circle-xmark"}} {{/if}}

    @@ -109,7 +109,7 @@ class="deleted-user" title={{i18n "admin.user.deleted"}} > - {{d-icon "far-trash-alt"}} + {{d-icon "trash-can"}}     {{/if}}
    @@ -154,14 +154,14 @@ {{d-icon "info-circle"}} + >{{d-icon "circle-info"}} {{i18n "admin.logs.staff_actions.show"}} {{/if}} {{#if item.useModalForDetails}} {{d-icon "info-circle"}} + >{{d-icon "circle-info"}} {{i18n "admin.logs.staff_actions.show"}} {{/if}}
    diff --git a/app/assets/javascripts/admin/addon/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs index 3dec4e30015..135b614467f 100644 --- a/app/assets/javascripts/admin/addon/templates/permalinks.hbs +++ b/app/assets/javascripts/admin/addon/templates/permalinks.hbs @@ -56,7 +56,7 @@ {{/if}} {{#if pl.external_url}} {{#if pl.linkIsExternal}} - {{d-icon "external-link-alt"}} + {{d-icon "up-right-from-square"}} {{/if}} {{pl.external_url}} {{/if}} @@ -67,7 +67,7 @@ diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs index 2cc9180a05e..6edfa99661d 100644 --- a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs @@ -35,7 +35,7 @@
    - {{dIcon "info-circle"}} + {{dIcon "circle-info"}} {{i18n "admin.plugins.howto"}} diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs index 52e9aa33530..8d9f1643830 100644 --- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs @@ -14,7 +14,7 @@ @action={{this.showReseedModal}} @label="admin.reseed.action.label" @title="admin.reseed.action.title" - @icon="sync" + @icon="arrows-rotate" class="btn-default" />
    diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs index c04d2a6109d..a2c69d3864f 100644 --- a/app/assets/javascripts/admin/addon/templates/user-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs @@ -232,7 +232,7 @@ {{#if this.canDisableSecondFactor}} @@ -365,7 +365,7 @@ {{#if this.model.can_revoke_admin}} @@ -373,7 +373,7 @@ {{#if this.model.can_grant_admin}} @@ -388,7 +388,7 @@ {{#if this.model.can_revoke_moderation}} @@ -396,7 +396,7 @@ {{#if this.model.can_grant_moderation}} @@ -423,7 +423,7 @@ />
    @@ -585,7 +585,7 @@
    @@ -618,7 +618,7 @@
    @@ -644,7 +644,7 @@ class="ok" /> @@ -694,7 +694,7 @@ {{#if this.model.post_count}} @@ -782,7 +782,7 @@
    @@ -877,7 +877,7 @@ {{#if this.model.can_be_anonymized}} @@ -886,7 +886,7 @@ {{#if this.model.canBeDeleted}} @@ -895,7 +895,7 @@ {{#if this.model.can_be_merged}} @@ -906,7 +906,7 @@

    - {{d-icon "exclamation-triangle"}} + {{d-icon "triangle-exclamation"}} {{this.deleteExplanation}}
    {{/if}} diff --git a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs index ca429574b62..21ae2d26d95 100644 --- a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs +++ b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs @@ -145,11 +145,11 @@ {{#if this.model.tl3Requirements.requirements_lost}} {{! tl implicitly not locked }} {{#if this.model.tl3Requirements.on_grace_period}} - {{d-icon "times"}} + {{d-icon "xmark"}} {{i18n "admin.user.tl3_requirements.on_grace_period"}} {{else}} {{! not on grace period }} - {{d-icon "times"}} + {{d-icon "xmark"}} {{i18n "admin.user.tl3_requirements.does_not_qualify"}} {{i18n "admin.user.tl3_requirements.will_be_demoted"}} {{/if}} @@ -180,7 +180,7 @@ {{d-icon "lock"}} {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}} {{else}} - {{d-icon "times"}} + {{d-icon "xmark"}} {{i18n "admin.user.tl3_requirements.does_not_qualify"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs index 881ae60d171..e60890452ac 100644 --- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs @@ -256,10 +256,10 @@ {{#if user.admin}} - {{d-icon "shield-alt" title="admin.title"}} + {{d-icon "shield-halved" title="admin.title"}} {{/if}} {{#if user.moderator}} - {{d-icon "shield-alt" title="admin.moderator"}} + {{d-icon "shield-halved" title="admin.moderator"}} {{/if}} {{#if user.second_factor_enabled}} {{d-icon "lock" title="admin.user.second_factor_enabled"}} diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs index 15dde5f9260..c06ae14cda6 100644 --- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs +++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs @@ -26,7 +26,7 @@ diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs index 2af64ed2a1d..064a246e90f 100644 --- a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs @@ -47,12 +47,12 @@ class="btn btn-default no-text" title={{i18n "admin.web_hooks.edit"}} > - {{d-icon "far-edit"}} + {{d-icon "far-pen-to-square"}} diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs index 80e5461e7c3..3c9f2371bb0 100644 --- a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs +++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs @@ -9,14 +9,14 @@ diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs index 91e7939eafa..f163f477e61 100644 --- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs +++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs @@ -35,7 +35,7 @@ export default class DialogHolder extends Component {
    diff --git a/app/assets/javascripts/discourse/app/components/about-page.gjs b/app/assets/javascripts/discourse/app/components/about-page.gjs index 78be9620a0d..f95b35c5674 100644 --- a/app/assets/javascripts/discourse/app/components/about-page.gjs +++ b/app/assets/javascripts/discourse/app/components/about-page.gjs @@ -47,7 +47,7 @@ export default class AboutPage extends Component { }, { class: "admins", - icon: "shield-alt", + icon: "shield-halved", text: I18n.t("about.admin_count", { count: this.adminsCount, formatted_number: I18n.toNumber(this.adminsCount, { precision: 0 }), @@ -55,7 +55,7 @@ export default class AboutPage extends Component { }, { class: "moderators", - icon: "shield-alt", + icon: "shield-halved", text: I18n.t("about.moderator_count", { count: this.moderatorsCount, formatted_number: I18n.toNumber(this.moderatorsCount, { @@ -65,7 +65,7 @@ export default class AboutPage extends Component { }, { class: "site-creation-date", - icon: "calendar-alt", + icon: "calendar-days", text: this.siteAgeString, }, ]; @@ -83,7 +83,7 @@ export default class AboutPage extends Component { period: I18n.t("about.activities.periods.last_7_days"), }, { - icon: "pencil-alt", + icon: "pencil", class: "posts", activityText: I18n.t("about.activities.posts", { 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"), }, { - icon: "user-friends", + icon: "user-group", class: "active-users", activityText: I18n.t("about.activities.active_users", { count: this.args.model.stats.active_users_7_days, diff --git a/app/assets/javascripts/discourse/app/components/actions-summary.gjs b/app/assets/javascripts/discourse/app/components/actions-summary.gjs index 2a6c2eadd0f..4401d23e783 100644 --- a/app/assets/javascripts/discourse/app/components/actions-summary.gjs +++ b/app/assets/javascripts/discourse/app/components/actions-summary.gjs @@ -9,7 +9,7 @@ const ActionsSummary =