From 5d282154ce69635b1d7752caf5aca4e771b0df4d Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 22 Mar 2022 09:10:16 +0900
Subject: [PATCH] Add: Option - color like toolbar

---
 src/tabbar/_selected_tab.scss              | 2 +-
 src/theme/system_default_theme/_mac.scss   | 4 ++--
 src/theme/system_default_theme/_win10.scss | 2 +-
 user.js                                    | 1 +
 userChrome.css                             | 8 ++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tabbar/_selected_tab.scss b/src/tabbar/_selected_tab.scss
index 1733e55..8ef7dd8 100644
--- a/src/tabbar/_selected_tab.scss
+++ b/src/tabbar/_selected_tab.scss
@@ -1,5 +1,5 @@
 /*= Selected Tab - Color like toolbar ========================================*/
-@include Option("userChrome.tab.connect_to_window") {
+@include Option("userChrome.tab.color_like_toolbar") {
   @import "selected_tab/color_like_toolbar";
 }
 
diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss
index 0bfbbac..17efe8c 100644
--- a/src/theme/system_default_theme/_mac.scss
+++ b/src/theme/system_default_theme/_mac.scss
@@ -160,7 +160,7 @@
     }
   }
   /*- Proton Tab Selected ----------------------------------------------------*/
-  @include NotOption("userChrome.tab.connect_to_window") {
+  @include NotOption("userChrome.tab.color_like_toolbar") {
     #{system-default-theme()} {
       --mac-proton-tab-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 20%, -moz-dialog);
     }
@@ -229,7 +229,7 @@
   }
 
   /* Hard Coded */
-  @include Option("userChrome.tab.connect_to_window") {
+  @include Option("userChrome.tab.color_like_toolbar") {
     :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode] /* Legacy */
       #tabbrowser-tabs:not([movingtab])
       > #tabbrowser-arrowscrollbox
diff --git a/src/theme/system_default_theme/_win10.scss b/src/theme/system_default_theme/_win10.scss
index b94ba01..7bbc26a 100644
--- a/src/theme/system_default_theme/_win10.scss
+++ b/src/theme/system_default_theme/_win10.scss
@@ -195,7 +195,7 @@
   }
 
   /*- Proton Tab Selected ----------------------------------------------------*/
-  @include NotOption("userChrome.tab.connect_to_window") {
+  @include NotOption("userChrome.tab.color_like_toolbar") {
     #{system-default-theme()} {
       --win-proton-tab-selected-bgcolor: color-mix(in srgb, var(--win-bgcolor) 5%, var(--win-component-bgcolor));
     }
diff --git a/user.js b/user.js
index 083ba1d..be305da 100644
--- a/user.js
+++ b/user.js
@@ -29,6 +29,7 @@ user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar"
 // ** Theme Related Options ****************************************************
 // Mutliple
 user_pref("userChrome.tab.connect_to_window",          true); // Original, Photon
+user_pref("userChrome.tab.color_like_toolbar",         true); // Original, Photon
 
 user_pref("userChrome.tab.lepton_like_padding",        true); // Original
 // user_pref("userChrome.tab.photon_like_padding",     true); // Photon
diff --git a/userChrome.css b/userChrome.css
index 2ce9ddb..d3d0dfc 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -526,7 +526,7 @@
     }
 
     /*- Proton Tab Selected ----------------------------------------------------*/
-    @supports not -moz-bool-pref("userChrome.tab.connect_to_window") {
+    @supports not -moz-bool-pref("userChrome.tab.color_like_toolbar") {
       :root:not(:-moz-lwtheme),
       :root[lwt-default-theme-in-dark-mode] {
         --win-proton-tab-selected-bgcolor: color-mix(in srgb, var(--win-bgcolor) 5%, var(--win-component-bgcolor));
@@ -811,7 +811,7 @@
       }
     }
     /*- Proton Tab Selected ----------------------------------------------------*/
-    @supports not -moz-bool-pref("userChrome.tab.connect_to_window") {
+    @supports not -moz-bool-pref("userChrome.tab.color_like_toolbar") {
       :root:not(:-moz-lwtheme),
       :root[lwt-default-theme-in-dark-mode] {
         --mac-proton-tab-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 20%, -moz-dialog);
@@ -885,7 +885,7 @@
       }
     }
     /* Hard Coded */
-    @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
+    @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") {
       :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode]
         #tabbrowser-tabs:not([movingtab])
         > #tabbrowser-arrowscrollbox
@@ -3504,7 +3504,7 @@
 }
 /*= Selected Tab =============================================================*/
 /*= Selected Tab - Color like toolbar ========================================*/
-@supports -moz-bool-pref("userChrome.tab.connect_to_window") {
+@supports -moz-bool-pref("userChrome.tab.color_like_toolbar") {
   :root:not(:-moz-lwtheme) {
     /* Fix for windows's system default theme. Using --toolbar-bgcolor fallback */
     --tab-selected-bgcolor: unset !important;