From f3f5f4bc80ec72961adcca5d3d6eb0f60d490b55 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 13 Feb 2023 05:59:19 +0900
Subject: [PATCH] Revert "Add: Theme - Built In Color"

This reverts commit b960c6f43fa0ccb66c66b6858ee308073f0b3b2e.

Revert "Fix: Theme - Built In Light theme selector"

This reverts commit 987a9f77daa3e0b979d018d18c8904081d15ba25.

Revert "Clean: Theme - Hex to RGB"

This reverts commit 00110fca89050dc8e77abb308af06e0027594f7c.
---
 __tests__/theme.test.scss      | 12 ++++++------
 css/leptonChrome.css           | 33 +++++----------------------------
 src/leptonChrome.scss          |  5 -----
 src/theme/_built_in_color.scss | 18 ------------------
 src/utils/_theme.scss          |  2 +-
 user.js                        |  1 -
 6 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 src/theme/_built_in_color.scss

diff --git a/__tests__/theme.test.scss b/__tests__/theme.test.scss
index 6438a2a..0e964c8 100644
--- a/__tests__/theme.test.scss
+++ b/__tests__/theme.test.scss
@@ -59,7 +59,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark], :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) {
+        :root[lwtheme-mozlightdark], :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) {
           @include example_property;
         }
       }
@@ -74,7 +74,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark][inFullscreen=true], :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"])[inFullscreen=true] {
+        :root[lwtheme-mozlightdark][inFullscreen=true], :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"])[inFullscreen=true] {
           @include example_property;
         }
       }
@@ -89,7 +89,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark] #navigator-toolbox, :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) #navigator-toolbox {
+        :root[lwtheme-mozlightdark] #navigator-toolbox, :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) #navigator-toolbox {
           @include example_property;
         }
       }
@@ -106,7 +106,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright]), :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] {
+        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright]), :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] {
           @include example_property;
         }
       }
@@ -121,7 +121,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright])[inFullscreen=true], :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][inFullscreen=true], :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"][inFullscreen=true] {
+        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright])[inFullscreen=true], :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][inFullscreen=true] {
           @include example_property;
         }
       }
@@ -136,7 +136,7 @@
         }
       }
       @include expect {
-        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright]) #navigator-toolbox, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox, :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+        :root[lwtheme-mozlightdark]:not([lwthemetextcolor=bright]) #navigator-toolbox, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
           @include example_property;
         }
       }
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index eee34fb..2a47cd1 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1,46 +1,22 @@
 @charset "UTF-8";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 @namespace html "http://www.w3.org/1999/xhtml";
-/** Default Theme - Built In Color ********************************************/
-@supports -moz-bool-pref("userChrome.theme.built_in_color") {
-  /*= Lightmode ================================================================*/
-  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
-  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
-  :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] {
-    --lwt-accent-color: rgb(240, 240, 244) !important; /* Original: rgb(237,237,241) */
-    --toolbar-bgcolor: rgb(249, 249, 251) !important; /* white, rgb(255, 255, 255) */
-    --toolbar-field-background-color: rgb(240, 240, 244) !important; /* rgb(249, 249, 251) */
-  }
-  /*= Darkmode =================================================================*/
-  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
-  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
-    --lwt-selected-tab-background-color: rgb(66, 65, 77) !important; /* rgb(82, 82, 94) */
-    --toolbar-bgcolor: rgb(43, 42, 51) !important; /* rgb(82, 82, 94) */
-    --toolbar-field-background-color: rgb(28, 27, 34) !important; /* rgb(74, 74, 85) */
-    --toolbar-field-focus-background-color: rgb(66, 65, 77) !important; /* black rgba(0, 0, 0, 1) */
-    --button-hover-bgcolor: rgb(82, 82, 94) !important;
-    --button-active-bgcolor: rgb(91, 91, 102) !important;
-  }
-}
 /** Default Theme - Contrast **************************************************/
 @supports -moz-bool-pref("userChrome.theme.built_in_contrast") {
   /*= Lightmode - Color darker =================================================*/
   :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
-  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
-  :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] {
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] {
     --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */
   }
   @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
     :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
-    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox,
-    :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
       background-color: var(--lwt-accent-color) !important;
     }
   }
   @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
     :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
-    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox,
-    :root[style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
       background-color: var(--lwt-accent-color) !important;
     }
   }
@@ -7714,7 +7690,8 @@
   .tab-icon-image[crashed] {
     display: none !important;
   }
-} /** Nav Bar UI ****************************************************************/
+}
+/** Nav Bar UI ****************************************************************/
 /*= Nav Bar - Navbar comabine with sidebar===================================*/
 @supports -moz-bool-pref("userChrome.navbar.as_sidebar") {
   :root {
diff --git a/src/leptonChrome.scss b/src/leptonChrome.scss
index 7f4c98b..000d72e 100644
--- a/src/leptonChrome.scss
+++ b/src/leptonChrome.scss
@@ -15,11 +15,6 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 @namespace html "http://www.w3.org/1999/xhtml";
 
-/** Default Theme - Built In Color ********************************************/
-@include Option("userChrome.theme.built_in_color") {
-  @import "theme/built_in_color";
-}
-
 /** Default Theme - Contrast **************************************************/
 @include Option("userChrome.theme.built_in_contrast") {
   @import "theme/built_in";
diff --git a/src/theme/_built_in_color.scss b/src/theme/_built_in_color.scss
deleted file mode 100644
index a2a0e01..0000000
--- a/src/theme/_built_in_color.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-// https://github.com/mozilla/gecko-dev/commit/c6c9389373fc979b3ac4cdc15bfc019ced1e3151
-/*= Lightmode ================================================================*/
-#{built-in-light-theme()} {
-  // --lwt-selected-tab-background-color: #fff !important; /* Original: white, rgb(255, 255, 255) */
-  --lwt-accent-color: rgb(240, 240, 244) !important; /* Original: rgb(237,237,241) */
-  --toolbar-bgcolor: rgb(249, 249, 251) !important; /* white, rgb(255, 255, 255) */
-  --toolbar-field-background-color: rgb(240, 240, 244) !important; /* rgb(249, 249, 251) */
-}
-
-/*= Darkmode =================================================================*/
-#{built-in-dark-theme()} {
-  --lwt-selected-tab-background-color: rgb(66,65,77) !important; /* rgb(82, 82, 94) */
-  --toolbar-bgcolor: rgb(43,42,51) !important; /* rgb(82, 82, 94) */
-  --toolbar-field-background-color: rgb(28, 27, 34) !important; /* rgb(74, 74, 85) */
-  --toolbar-field-focus-background-color: rgb(66,65,77) !important; /* black rgba(0, 0, 0, 1) */
-  --button-hover-bgcolor: rgb(82,82,94) !important;
-  --button-active-bgcolor: rgb(91,91,102) !important;
-}
diff --git a/src/utils/_theme.scss b/src/utils/_theme.scss
index 769c412..661954d 100644
--- a/src/utils/_theme.scss
+++ b/src/utils/_theme.scss
@@ -8,7 +8,7 @@ $_lightText: '[lwthemetextcolor="bright"]';
 $_darkText:  ":not(#{$_lightText})";
 
 $_sysDark: "[lwt-default-theme-in-dark-mode]";
-$_lightStyle: '[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(237, 237, 241); --lwt-text-color: rgba(21, 20, 26);"]'; // --lwt-accent-color: rgb(237, 237, 241) is FF110
+$_lightStyle: '[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"]';
 $_darkStyle: '[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]';
 
 //== Mixin =====================================================================
diff --git a/user.js b/user.js
index c2fa332..92b7278 100644
--- a/user.js
+++ b/user.js
@@ -213,7 +213,6 @@ user_pref("userChrome.rounding.square_tab",           false);
 user_pref("userChrome.compatibility.theme",       true);
 user_pref("userChrome.compatibility.os",          true);
 
-user_pref("userChrome.theme.built_in_color",      true);
 user_pref("userChrome.theme.built_in_contrast",   true);
 user_pref("userChrome.theme.system_default",      true);
 user_pref("userChrome.theme.proton_color",        true);