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

Fix: Combined - none_forward_background -> none_background

Browse source
This commit is contained in:
alstjr7375 2022-12-11 22:58:50 +09:00
parent 529baece76
commit 25d2de6656
3 changed files with 84 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

86
css/leptonChrome.css
View file

@ -8076,7 +8076,7 @@
} }
} }
@supports not -moz-bool-pref("userChrome.combined.urlbar.nav_button") { @supports not -moz-bool-pref("userChrome.combined.urlbar.nav_button") {
@supports not -moz-bool-pref("userChrome.combined.nav_button.none_forward_background") { @supports not -moz-bool-pref("userChrome.combined.nav_button.none_background") {
@supports -moz-bool-pref("userChrome.combined.urlbar.home_button") { @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") {
@supports not -moz-bool-pref("userChrome.combined.nav_button.home_button") { @supports not -moz-bool-pref("userChrome.combined.nav_button.home_button") {
#nav-bar-customization-target > #forward-button > .toolbarbutton-icon { #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
@ -8101,7 +8101,7 @@
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%); fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
} }
@supports not -moz-bool-pref("userChrome.autohide.forward_button") { @supports not -moz-bool-pref("userChrome.autohide.forward_button") {
#nav-bar-customization-target > #forward-button[disabled="true"] { #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */ opacity: 1 !important; /* Original: 0.4 */
} }
} }
@ -8130,7 +8130,7 @@
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%); fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
} }
@supports not -moz-bool-pref("userChrome.autohide.forward_button") { @supports not -moz-bool-pref("userChrome.autohide.forward_button") {
#nav-bar-customization-target > #forward-button[disabled="true"] { #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */ opacity: 1 !important; /* Original: 0.4 */
} }
} }
@ -8151,30 +8151,64 @@
#nav-bar-customization-target > #back-button { #nav-bar-customization-target > #back-button {
position: relative; position: relative;
} }
#nav-bar-customization-target > #back-button > .toolbarbutton-icon { @supports not -moz-bool-pref("userChrome.combined.urlbar.home_button") {
background-color: var(--uc-combined-circlebutton-background); @supports not -moz-bool-pref("userChrome.combined.nav_button.home_button") {
#nav-bar-customization-target > #back-button > .toolbarbutton-icon {
background-color: var(--uc-combined-circlebutton-background);
}
#nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
background-color: var(--uc-combined-circlebutton-hover-background) !important;
box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
border-color: hsla(240deg, 5%, 5%, 0.35);
}
#nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
#nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
background-color: var(--uc-combined-circlebutton-active-background) !important;
border-color: hsla(240deg, 5%, 5%, 0.4);
}
#nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
background-color: color-mix(
in srgb,
var(--toolbarbutton-hover-background),
var(--toolbar-field-background-color) 40%
) !important;
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
}
@supports not -moz-bool-pref("userChrome.autohide.back_button") {
#nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */
}
}
}
} }
#nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon { @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") or -moz-bool-pref("userChrome.combined.nav_button.home_button") {
background-color: var(--uc-combined-circlebutton-hover-background) !important; @supports not -moz-bool-pref("userChrome.combined.nav_button.none_background") {
box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1); #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
border-color: hsla(240deg, 5%, 5%, 0.35); background-color: var(--uc-combined-circlebutton-background);
} }
#nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon, #nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
#nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon { background-color: var(--uc-combined-circlebutton-hover-background) !important;
background-color: var(--uc-combined-circlebutton-active-background) !important; box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
border-color: hsla(240deg, 5%, 5%, 0.4); border-color: hsla(240deg, 5%, 5%, 0.35);
} }
#nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon { #nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
background-color: color-mix( #nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
in srgb, background-color: var(--uc-combined-circlebutton-active-background) !important;
var(--toolbarbutton-hover-background), border-color: hsla(240deg, 5%, 5%, 0.4);
var(--toolbar-field-background-color) 40% }
) !important; #nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%); background-color: color-mix(
} in srgb,
@supports not -moz-bool-pref("userChrome.autohide.back_button") { var(--toolbarbutton-hover-background),
#nav-bar-customization-target > #back-button[disabled="true"] { var(--toolbar-field-background-color) 40%
opacity: 1 !important; /* Original: 0.4 */ ) !important;
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
}
@supports not -moz-bool-pref("userChrome.autohide.back_button") {
#nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */
}
}
} }
} }
@supports -moz-bool-pref("userChrome.combined.nav_button.home_button") or -moz-bool-pref("userChrome.combined.urlbar.home_button") { @supports -moz-bool-pref("userChrome.combined.nav_button.home_button") or -moz-bool-pref("userChrome.combined.urlbar.home_button") {

41
src/combined/_back_forward_button.scss
View file

@ -1,5 +1,5 @@
//-- Mixin --------------------------------------------------------------------- //-- Mixin ---------------------------------------------------------------------
@mixin _combined_nav_button_background() { @mixin _combined_nav_button_background($autohideOptionName) {
> .toolbarbutton-icon { > .toolbarbutton-icon {
background-color: var(--uc-combined-circlebutton-background); background-color: var(--uc-combined-circlebutton-background);
} }
@ -19,8 +19,19 @@
background-color: color-mix(in srgb, var(--toolbarbutton-hover-background), var(--toolbar-field-background-color) 40%) !important; background-color: color-mix(in srgb, var(--toolbarbutton-hover-background), var(--toolbar-field-background-color) 40%) !important;
fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%); fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
} }
@include NotOption($autohideOptionName) {
&[disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */
}
}
} }
} }
@mixin _combined_forward_button_background() {
@include _combined_nav_button_background("userChrome.autohide.forward_button");
}
@mixin _combined_back_button_background() {
@include _combined_nav_button_background("userChrome.autohide.back_button");
}
@mixin _back_button_circle_shape() { @mixin _back_button_circle_shape() {
z-index: 3 !important; z-index: 3 !important;
@ -81,24 +92,14 @@
padding-inline-end: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */ padding-inline-end: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */
} }
@include NotOption("userChrome.combined.urlbar.nav_button") { @include NotOption("userChrome.combined.urlbar.nav_button") {
@include NotOption("userChrome.combined.nav_button.none_forward_background") { @include NotOption("userChrome.combined.nav_button.none_background") {
@include Option("userChrome.combined.urlbar.home_button") { @include Option("userChrome.combined.urlbar.home_button") {
@include NotOption("userChrome.combined.nav_button.home_button") { @include NotOption("userChrome.combined.nav_button.home_button") {
@include _combined_nav_button_background; @include _combined_forward_button_background;
@include NotOption("userChrome.autohide.forward_button") {
&[disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */
}
}
} }
} }
@include NotOption("userChrome.combined.urlbar.home_button") { @include NotOption("userChrome.combined.urlbar.home_button") {
@include _combined_nav_button_background; @include _combined_forward_button_background;
@include NotOption("userChrome.autohide.forward_button") {
&[disabled="true"] {
opacity: 1 !important; /* Original: 0.4 */
}
}
} }
} }
} }
@ -117,10 +118,14 @@
#back-button { #back-button {
position: relative; position: relative;
@include _combined_nav_button_background; @include NotOption("userChrome.combined.urlbar.home_button") {
@include NotOption("userChrome.autohide.back_button") { @include NotOption("userChrome.combined.nav_button.home_button") {
&[disabled="true"] { @include _combined_back_button_background;
opacity: 1 !important; /* Original: 0.4 */ }
}
@include Option("userChrome.combined.urlbar.home_button", "userChrome.combined.nav_button.home_button") {
@include NotOption("userChrome.combined.nav_button.none_background") {
@include _combined_back_button_background;
} }
} }
@include Option("userChrome.combined.nav_button.home_button", "userChrome.combined.urlbar.home_button") { @include Option("userChrome.combined.nav_button.home_button", "userChrome.combined.urlbar.home_button") {

2
user.js
View file

@ -113,7 +113,7 @@ user_pref("userChrome.rounding.square_tab", false);
// user_pref("userChrome.combined.nav_button", true); // user_pref("userChrome.combined.nav_button", true);
// user_pref("userChrome.combined.nav_button.home_button", true); // user_pref("userChrome.combined.nav_button.home_button", true);
// user_pref("userChrome.combined.nav_button.normal_foward", true); // user_pref("userChrome.combined.nav_button.normal_foward", true);
// user_pref("userChrome.combined.nav_button.none_forward_background", true); // user_pref("userChrome.combined.nav_button.none_background", true);
// user_pref("userChrome.combined.urlbar.nav_button", true); // user_pref("userChrome.combined.urlbar.nav_button", true);
// user_pref("userChrome.combined.urlbar.home_button", true); // user_pref("userChrome.combined.urlbar.home_button", true);
// user_pref("userChrome.combined.urlbar.reload_button", true); // user_pref("userChrome.combined.urlbar.reload_button", true);