From fa9606016c21e1f6a669f4cf4079c695883779f3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 20 Dec 2024 10:51:35 +1000
Subject: [PATCH] UX: Site setting filter background inconsistencies (#30393)

Followup 203f93bcaffab1f493be70c2277ef11048f2017e

This commit makes sure the background for all the admin
site settings filters (including the filter input and
override checkbox) is consistent no matter what the theme,
as it currently changes based on theme.
---
 .../common/admin/admin_config_area.scss           | 15 ++++++++++-----
 .../stylesheets/common/admin/site-settings.scss   |  5 -----
 config/locales/client.en.yml                      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_config_area.scss b/app/assets/stylesheets/common/admin/admin_config_area.scss
index 674c64be9c3..7cdfdcd3d5d 100644
--- a/app/assets/stylesheets/common/admin/admin_config_area.scss
+++ b/app/assets/stylesheets/common/admin/admin_config_area.scss
@@ -92,17 +92,22 @@
   }
 
   &__settings {
-    .admin-site-settings-filter-controls {
-      background: var(--primary-very-low);
-      margin-bottom: 1em;
-    }
-
     .setting-label {
       margin-left: 18px;
     }
   }
 }
 
+.admin-site-settings-filter-controls {
+  background: var(--primary-very-low);
+  margin-bottom: 1em;
+
+  .controls,
+  .search.controls {
+    background: var(--primary-very-low);
+  }
+}
+
 .admin-config-area-empty-list {
   padding: 1em;
   border: 1px solid var(--primary-low);
diff --git a/app/assets/stylesheets/common/admin/site-settings.scss b/app/assets/stylesheets/common/admin/site-settings.scss
index 6c2db1dcb91..82683559988 100644
--- a/app/assets/stylesheets/common/admin/site-settings.scss
+++ b/app/assets/stylesheets/common/admin/site-settings.scss
@@ -10,11 +10,6 @@
 
 .admin-plugin-config-area {
   &__settings {
-    .admin-site-settings-filter-controls {
-      background: var(--primary-very-low);
-      margin-bottom: 1em;
-    }
-
     .admin-filtered-site-settings {
       padding: 0.5em 1em;
     }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ad255ff8204..23c5f8ea854 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5108,7 +5108,7 @@ en:
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
     # This is a text input placeholder, keep the translation short
-    type_to_filter: "type to filter…"
+    type_to_filter: "Type to filter…"
     settings: "Settings"
 
     admin: