Fix: Combined - First toolbar button padding

This commit is contained in:
alstjr7375 2022-12-12 22:40:40 +09:00
parent 25d2de6656
commit 54e25560a4
3 changed files with 72 additions and 7 deletions

View file

@ -8215,7 +8215,6 @@
#nav-bar-customization-target > #back-button {
z-index: 2;
margin-inline-end: calc(-1 * var(--uc-toolbarbutton-boundary) - 1px) !important;
padding-inline-start: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */
}
#nav-bar-customization-target > #back-button > .toolbarbutton-icon {
padding-inline-start: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */
@ -8346,11 +8345,43 @@
#nav-bar-customization-target > #forward-button {
-moz-box-ordinal-group: 4;
}
@supports -moz-bool-pref("userChrome.combined.urlbar.home_button") {
#nav-bar-customization-target
> :first-child:is(#back-button, #forward-button, #home-button)
+ :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
#nav-bar-customization-target
> :first-child:is(#back-button, #forward-button, #home-button)
+ :is(#back-button, #forward-button, #home-button)
+ :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
#nav-bar-customization-target
> :first-child:is(#back-button, #forward-button, #home-button)
+ :is(#back-button, #forward-button, #home-button)
+ :is(#back-button, #forward-button, #home-button)
+ :is(toolbarbutton, toolbaritem) {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
@supports not -moz-bool-pref("userChrome.combined.urlbar.home_button") {
#nav-bar-customization-target
> :first-child:is(#back-button, #forward-button)
+ :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button),
#nav-bar-customization-target
> :first-child:is(#back-button, #forward-button)
+ :is(#back-button, #forward-button)
+ :is(toolbarbutton, toolbaritem) {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
}
@supports -moz-bool-pref("userChrome.combined.urlbar.home_button") {
#nav-bar-customization-target > #home-button {
-moz-box-ordinal-group: 3;
}
@supports not -moz-bool-pref("userChrome.combined.urlbar.nav_button") {
#nav-bar-customization-target > #home-button:is(:first-child) + :is(toolbarbutton, toolbaritem) {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
#nav-bar-customization-target > #home-button {
z-index: 3;
position: relative;

View file

@ -132,7 +132,6 @@
z-index: 2;
margin-inline-end: calc(-1 * var(--uc-toolbarbutton-boundary) - 1px) !important;
padding-inline-start: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */
> .toolbarbutton-icon {
padding-inline-start: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */

View file

@ -92,16 +92,51 @@
}
@include Option("userChrome.combined.urlbar.nav_button") {
#nav-bar-customization-target > #back-button {
-moz-box-ordinal-group: 2;
}
#nav-bar-customization-target > #forward-button {
-moz-box-ordinal-group: 4;
#nav-bar-customization-target > {
#back-button {
-moz-box-ordinal-group: 2;
}
#forward-button {
-moz-box-ordinal-group: 4;
}
$button: ":is(toolbarbutton, toolbaritem)";
@include Option("userChrome.combined.urlbar.home_button") {
$combindButtons: "#back-button, #forward-button, #home-button";
$target: ":is(#{$combindButtons})";
$notTarget: "#{$button}:not(#{$combindButtons})";
:first-child#{$target} + {
#{$notTarget},
#{$target} + #{$notTarget},
#{$target} + #{$target} + #{$button} {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
}
@include NotOption("userChrome.combined.urlbar.home_button") {
$combindButtons: "#back-button, #forward-button";
$target: ":is(#{$combindButtons})";
$notTarget: "#{$button}:not(#{$combindButtons})";
:first-child#{$target} + {
#{$notTarget},
#{$target} + #{$button} {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
}
}
}
@include Option("userChrome.combined.urlbar.home_button") {
#nav-bar-customization-target > #home-button {
-moz-box-ordinal-group: 3;
@include NotOption("userChrome.combined.urlbar.nav_button") {
&:is(:first-child) + :is(toolbarbutton, toolbaritem) {
padding-inline-start: var(--toolbar-start-end-padding) !important;
}
}
}
@import "home_button";
}