Merge branch 'master' into dev

Conflicts: userChrome.css
black7375 · Oct 31, 2021 · 763fc02 · 763fc02
2 parents d1d6155 + b598053
commit 763fc02
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -9,6 +9,9 @@ on:
       - dev
       - photon-style
       - proton-style
+    paths:
+      - userChrome.css
+      - userContent.css
 
 jobs:
   prettier:

diff --git a/user.js b/user.js
@@ -20,9 +20,12 @@ user_pref("layout.css.backdrop-filter.enabled", true);
 // Restore Compact Mode - 89 Above
 user_pref("browser.compactmode.show", true);
 
-// about:home Search Bar
+// about:home Search Bar - 89 Above
 user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", false);
 
+// Browser Theme Based Scheme - Will be activate 95 Above
+// user_pref("layout.css.prefers-color-scheme.content-override", 3);
+
 // ** Useful Options ***********************************************************
 // Integrated calculator at urlbar
 user_pref("browser.urlbar.suggest.calculator", true);

diff --git a/userChrome.css b/userChrome.css
@@ -867,7 +867,7 @@
     --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
   }
 
-  @media (prefers-color-scheme: dark) {
+  @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
     :host,
     :root {
       /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
@@ -1045,7 +1045,7 @@
       --menu-border-color: #cfcfd8;
       --menuitem-hover-background-color: #e0e0e6;
     }
-    @media (prefers-color-scheme: dark) {
+    @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
       :root {
         --menu-border-color: rgba(107, 107, 107, 0.3);
         --menu-color: #fbfbfe;
@@ -1110,7 +1110,7 @@
   url("chrome://browser/content/pageinfo/pageInfo.xhtml")
   {
     /*- Overwrite ------------------------------------------------------------*/
-    @media (prefers-color-scheme: dark) {
+    @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
       :root {
         --in-content-page-background: #42414d;
       }

diff --git a/userContent.css b/userContent.css
@@ -75,7 +75,7 @@
       --newtab-element-hover-color: color-mix(in srgb, currentColor 9%, transparent) !important;
     }
 
-    @media (prefers-color-scheme: dark) {
+    @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
       #root {
         /* Default Dark Mode */
         --newtab-search-background-color: rgba(66, 65, 77, 1); /* Same as dark theme's --panel-background */
@@ -369,7 +369,7 @@
     --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
   }
 
-  @media (prefers-color-scheme: dark) {
+  @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
     :host,
     :root {
       /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */