From 7ed87979a22e6a8667fcc47c30c182534773f9cc Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Sat, 15 Oct 2022 22:29:37 +0200
Subject: [PATCH] UX: theme setting highlight update (#18607)

---
 .../addon/templates/customize-themes-show.hbs     |  1 +
 app/assets/stylesheets/common/admin/settings.scss | 15 ++++++++++++++-
 config/locales/client.en.yml                      |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index 4fe285d33eb..4fa8ebe52dc 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -282,6 +282,7 @@
     {{#if this.hasSettings}}
       <div class="control-unit">
         <div class="mini-title">{{i18n "admin.customize.theme.theme_settings"}}</div>
+        <p><i>{{i18n "admin.customize.theme.overriden_settings_explanation"}}</i></p>
         <DSection @class="form-horizontal theme settings control-unit">
           {{#each this.settings as |setting|}}
             <ThemeSettingEditor @setting={{setting}} @model={{this.model}} @class="theme-setting control-unit" />
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 7e023b55b33..bb2bd1936f1 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -109,8 +109,21 @@
     }
   }
   .setting.overridden {
+    input {
+      background-color: var(--highlight-medium);
+    }
     h3 {
-      color: var(--highlight-high);
+      position: relative;
+      &:before {
+        content: "";
+        position: absolute;
+        top: 0.5rem;
+        left: -1rem;
+        width: 0.5rem;
+        height: 0.5rem;
+        border-radius: 100%;
+        background-color: var(--highlight-high);
+      }
     }
   }
   .setting.overridden.string {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 34696fb3c32..3faf8f2d7ee 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4844,6 +4844,7 @@ en:
           has_overwritten_history: "Current theme version no longer exists because the Git history has been overwritten by a force push."
           add: "Add"
           theme_settings: "Theme Settings"
+          overriden_settings_explanation: "Overridden settings are marked with a dot and have a highlighted color. To reset these settings to the default value, press the reset button next to them."
           no_settings: "This theme has no settings."
           theme_translations: "Theme Translations"
           empty: "No items"