From bfc321350eb0224bd9c18e9422405143ecb4c25a Mon Sep 17 00:00:00 2001
From: bmFtZQ <62812711+bmFtZQ@users.noreply.github.com>
Date: Tue, 13 Apr 2021 02:54:21 +0800
Subject: [PATCH] fix variables for Proton

---
 chrome/global/global.css    | 17 +++++++++--------
 chrome/global/variables.css | 21 ++++++++++++++++++---
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/chrome/global/global.css b/chrome/global/global.css
index 0e41223..f54c905 100644
--- a/chrome/global/global.css
+++ b/chrome/global/global.css
@@ -80,22 +80,23 @@
 	background-clip: padding-box !important;
 }
 
+/*
 #navigator-toolbox :-moz-any(.toolbarbutton-1, .scrollbutton-up, .scrollbutton-down),
-/* no ::part workaround - may have side effects */
-.#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton),
-.#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)
+#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton),
+#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)
 {
-	max-height: 34px !important;
-	height: 34px !important;
-	min-height: 34px !important;
+	max-height: 32px !important;
+	height: 32px !important;
+	min-height: 32px !important;
 }
+*/
 
 #navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton))[disabled],
 /* no ::part workaround - may have side effects */
 #scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton)[disabled],
 #scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)[disabled]
 {
-	opacity: .42 !important;
+	opacity: 1 !important;
 }
 
 #navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton)):hover:not([disabled]),
@@ -326,4 +327,4 @@
 	border: 0 !important;
 	box-shadow: 0 0 0 1px #0004, 0 4px 6px #0004 !important;
 	padding: 3px 6px !important;
-}
\ No newline at end of file
+}
diff --git a/chrome/global/variables.css b/chrome/global/variables.css
index cb16542..e8cbdeb 100644
--- a/chrome/global/variables.css
+++ b/chrome/global/variables.css
@@ -9,7 +9,8 @@
 /* Light Mode */
 :root:not([style]),
 :root:not([lwtheme]),
-:root[style*="--lwt-accent-color:rgb(227, 228, 230); --lwt-text-color:rgba(24, 25, 26);"]
+:root[style*="--lwt-accent-color:rgb(227, 228, 230); --lwt-text-color:rgba(24, 25, 26);"],
+:root[style*="--lwt-accent-color:rgb(240, 240, 244); --lwt-text-color:rgba(21, 20, 26);"] /* Used for Proton (May be changed in future) */
 {
 	/* accentcolor */
 	--lwt-accent-color: #cecece !important;
@@ -19,6 +20,9 @@
 	
 	/* toolbar */
 	--toolbar-bgcolor: #f7f7f7 !important;
+
+	/* Force tabs to match --toolbar-bgcolor */
+	--lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
 	
 	/* toolbar_text */
 	--toolbar-color: #000 !important;
@@ -58,7 +62,8 @@
 	--private-browsing-indicator: #0078d4 !important;
 }
 /* Dark Mode */
-:root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"]
+:root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"],
+:root[style*="--lwt-accent-color:rgb(28, 27, 34); --lwt-text-color:rgba(251, 251, 254);"] /* Used for Proton (May be changed in future) */
 {
 	/* accentcolor */
 	--lwt-accent-color: #1b1b1b !important;
@@ -68,6 +73,9 @@
 	
 	/* toolbar */
 	--toolbar-bgcolor: #3b3b3b !important;
+
+	/* Force tabs to match --toolbar-bgcolor */
+	--lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
 	
 	/* toolbar_text */
 	--toolbar-color: #fff !important;
@@ -173,7 +181,14 @@
 	--toolbar-non-lwt-bgcolor: #f7f7f7 !important;
 	--toolbar-non-lwt-textcolor: #000 !important;
 
-	--tab-separator-opacity: .35 !important;
+	--tab-separator-opacity: .5 !important;
+}
+
+@media (-moz-proton) {
+	:root {
+		--arrowpanel-menuitem-margin: 0 !important; /* used to get rid of the left/right margins in Proton */
+		--space-above-tabbar: 0;
+	}
 }
 
 #titlebar,