mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2025-12-06 02:30:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Add: Theme - Built In Color"

Browse source 
This reverts commit b960c6f43f.

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

This reverts commit 987a9f77da.

Revert "Clean: Theme - Hex to RGB"

This reverts commit 00110fca89.
This commit is contained in:
alstjr7375 2023-02-13 05:59:19 +09:00
parent 3e9b0a29d1
commit f3f5f4bc80
6 changed files with 12 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

12
__tests__/theme.test.scss
View file

@ -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;
}
}

33
css/leptonChrome.css
View file

@ -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 {

5
src/leptonChrome.scss
View file

@ -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";

18
src/theme/_built_in_color.scss
View file

@ -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;
}

2
src/utils/_theme.scss
View file

@ -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 =====================================================================

1
user.js
View file

@ -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);