From e5c0cfcd27d6844669fcdbcb88d6c4e289d537aa Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 24 Jun 2024 09:54:34 -0400 Subject: [PATCH] UX: remove default use of quaternary color, update nav pill styles (#27502) --- .../addon/components/admin-theme-editor.js | 2 +- .../admin/addon/templates/dashboard.hbs | 2 +- .../fields/styling-preview/-preview-base.js | 2 +- .../wizard/components/wizard-canvas.gjs | 4 +- .../stylesheets/common/admin/admin_base.scss | 14 ++--- .../stylesheets/common/admin/customize.scss | 47 ++++++++-------- .../stylesheets/common/admin/dashboard.scss | 44 ++------------- .../stylesheets/common/base/discourse.scss | 8 +++ .../stylesheets/common/base/new-user.scss | 37 +++---------- .../components/horizontal-overflow-nav.scss | 2 +- .../common/components/keyboard_shortcuts.scss | 4 +- .../stylesheets/common/components/navs.scss | 27 +++++----- .../stylesheets/common/foundation/mixins.scss | 17 ++++++ .../common/select-kit/category-drop.scss | 9 ++-- .../common/select-kit/tag-drop.scss | 8 ++- .../stylesheets/desktop/topic-list.scss | 4 +- app/assets/stylesheets/mobile/topic-list.scss | 9 ++-- app/views/common/_discourse_splash.html.erb | 13 +---- config/locales/client.en.yml | 2 +- .../stylesheets/common/chat-browse.scss | 3 +- .../stylesheets/common/chat-footer.scss | 44 ++++++++------- .../assets/stylesheets/common/chat-index.scss | 8 ++- .../stylesheets/mobile/chat-footer.scss | 9 ---- .../components/modal/poll-ui-builder.hbs | 54 ++++++++++--------- .../stylesheets/common/poll-ui-builder.scss | 16 ++---- 25 files changed, 169 insertions(+), 220 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js index 4330acf9549..0ffdd46a55c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js +++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js @@ -52,7 +52,7 @@ export default class AdminThemeEditor extends Component { if (fieldName && fieldName === "color_definitions") { const example = ":root {\n" + - " --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)};\n" + + " --mytheme-tertiary-or-highlight: #{dark-light-choose($tertiary, $highlight)};\n" + "}"; return I18n.t("admin.customize.theme.color_definitions.placeholder", { diff --git a/app/assets/javascripts/admin/addon/templates/dashboard.hbs b/app/assets/javascripts/admin/addon/templates/dashboard.hbs index fabca7301b5..a8e9c1c0edd 100644 --- a/app/assets/javascripts/admin/addon/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/addon/templates/dashboard.hbs @@ -19,7 +19,7 @@ @refreshProblems={{action "refreshProblems"}} /> -