From ed315431274ac367f89b7934b360ba2692cf544f Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 30 Jan 2024 08:48:51 +0900
Subject: [PATCH] Fix: Theme - Better contrast for linux system theme urlbar
 #864

---
 css/leptonChrome.css                     | 26 ++++++++++++++++++++++++
 css/leptonChromeESR.css                  | 13 ++++++++++++
 src/theme/system_default_theme/_gtk.scss | 15 ++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 67801d92..41ee8182 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -764,6 +764,19 @@
       }
     }
   }
+  @media (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
+    :root:not(:-moz-lwtheme) {
+      --toolbar-field-background-color: Field !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-border-color: ThreeDShadow !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:not(:-moz-lwtheme) #urlbar-background,
+    :root:not(:-moz-lwtheme) #searchbar {
+      background-color: var(--toolbar-field-background-color) !important;
+    }
+  }
   /*= Mac - Default like color =================================================*/
   @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
     :root:not(:-moz-lwtheme),
@@ -14089,6 +14102,19 @@
     --urlbar-popup-url-color: -moz-accent-color;
   }
 }
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
+  :root:not(:-moz-lwtheme) {
+    --toolbar-field-background-color: Field !important;
+    --toolbar-field-color: FieldText !important;
+    --toolbar-field-border-color: ThreeDShadow !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
+  :root:not(:-moz-lwtheme) #urlbar-background,
+  :root:not(:-moz-lwtheme) #searchbar {
+    background-color: var(--toolbar-field-background-color) !important;
+  }
+}
 @media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
   :root:not(:-moz-lwtheme),
   :root[lwt-default-theme-in-dark-mode] {
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index 9c3a04dc..c7b7863d 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -983,6 +983,19 @@
       }
     }
   }
+  @media (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
+    :root:not(:-moz-lwtheme) {
+      --toolbar-field-background-color: Field !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-border-color: ThreeDShadow !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:not(:-moz-lwtheme) #urlbar-background,
+    :root:not(:-moz-lwtheme) #searchbar {
+      background-color: var(--toolbar-field-background-color) !important;
+    }
+  }
   /*= Mac - Default like color =================================================*/
   @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
     :root:not(:-moz-lwtheme),
diff --git a/src/theme/system_default_theme/_gtk.scss b/src/theme/system_default_theme/_gtk.scss
index fb4ec0f3..1f72f54e 100644
--- a/src/theme/system_default_theme/_gtk.scss
+++ b/src/theme/system_default_theme/_gtk.scss
@@ -5,4 +5,19 @@
       --urlbar-popup-url-color: #{$accentColor};
     }
   }
+
+  // #864
+  :root:not(:-moz-lwtheme) {
+    @media not (-moz-gtk-theme-family) {
+      // Rollback to color
+      --toolbar-field-background-color: Field !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-border-color: ThreeDShadow !important;
+    }
+
+    #urlbar-background, #searchbar {
+      // Original: light-dark(rgba(0, 0, 0, .05), rgba(0, 0, 0, .3))
+      background-color: var(--toolbar-field-background-color) !important;
+    }
+  }
 }