mirror of
https://github.com/black7375/Firefox-UI-Fix.git
synced 2026-02-03 22:10:30 -08:00
Fix: Theme - Linux non native menu padding
This commit is contained in:
alstjr7375
parent
40694b17bd
commit
4ebd991874
5 changed files with 67 additions and 19 deletions
41
css/leptonChrome.css
generated
41
css/leptonChrome.css
generated
|
|
@ -1146,6 +1146,7 @@
|
|||
--menu-icon-opacity: 0.7;
|
||||
--nested-margin: -10px;
|
||||
--windows-panel-box-shadow: 0 0 4px hsla(0, 0%, 0%, 0.2);
|
||||
--menu-checkbox-padding: 12px;
|
||||
}
|
||||
@media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
|
|
@ -1202,7 +1203,7 @@
|
|||
-moz-context-properties: fill, fill-opacity !important;
|
||||
fill: currentColor !important;
|
||||
fill-opacity: var(--menu-icon-opacity) !important;
|
||||
margin-inline-end: 1em !important;
|
||||
margin-inline-end: 1px !important;
|
||||
padding-top: 0 !important;
|
||||
}
|
||||
.menu-right > image {
|
||||
|
|
@ -1214,7 +1215,7 @@
|
|||
list-style-image: url("chrome://global/skin/icons/arrow-left.svg") !important;
|
||||
}
|
||||
menulist > menupopup > menuitem {
|
||||
padding-inline-end: 1em !important;
|
||||
padding-inline-end: 1px !important;
|
||||
}
|
||||
menupopup[needsgutter] menu:not([icon], .menu-iconic),
|
||||
menupopup[needsgutter] menuitem:not([type="checkbox"], [type="radio"], [icon], .menuitem-iconic) {
|
||||
|
|
@ -1230,10 +1231,19 @@
|
|||
}
|
||||
.menu-iconic > .menu-iconic-left,
|
||||
.menuitem-iconic > .menu-iconic-left {
|
||||
padding-inline-end: 0 !important;
|
||||
margin-inline-end: 8px !important;
|
||||
}
|
||||
menuitem[type="checkbox"],
|
||||
menuitem[type="radio"] {
|
||||
--menu-background-padding-default: var(--menu-checkbox-padding);
|
||||
}
|
||||
menuitem[checked="true"] {
|
||||
padding-inline-start: 12px !important;
|
||||
padding-inline-start: var(--menu-checkbox-padding) !important;
|
||||
}
|
||||
menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item .menu-iconic-left {
|
||||
padding-inline-end: 0 !important;
|
||||
margin-inline-end: 6px !important;
|
||||
}
|
||||
/* We need to do something to override the default style for selected
|
||||
checkboxes and radio buttons because the native drawing we use on other
|
||||
|
|
@ -1267,9 +1277,9 @@
|
|||
/* To account for the box-shadow below */
|
||||
margin: -4px !important;
|
||||
}
|
||||
menupopup > menuitem,
|
||||
menupopup > menu {
|
||||
padding-block: 0.5em !important;
|
||||
menupopup:not([placespopup="true"]) > menuitem,
|
||||
menupopup:not([placespopup="true"]) > menu {
|
||||
padding-block: var(--menu-padding, 0.5em) !important;
|
||||
padding-inline-start: 1em !important;
|
||||
}
|
||||
.menupopup-arrowscrollbox[part*="content"] {
|
||||
|
|
@ -1293,6 +1303,11 @@
|
|||
margin-inline-start: var(--nested-margin) !important;
|
||||
margin-top: var(--nested-margin) !important;
|
||||
}
|
||||
#mainPopupSet {
|
||||
--menu-background-padding-default: calc(
|
||||
var(--context-menu-background-padding) + var(--context-menu-text-padding-default)
|
||||
);
|
||||
}
|
||||
/* :not([hidden]) to avoid the display: flex unhiding the item. */
|
||||
#context-navigation:not([hidden]) {
|
||||
/* The Windows 10 version of the navigation area needs the scrollbox's
|
||||
|
|
@ -11222,7 +11237,8 @@
|
|||
@media (-moz-windows-non-native-menus) {
|
||||
:root {
|
||||
--context-menu-background-padding: 1em;
|
||||
--context-menu-text-padding: 24px;
|
||||
--context-menu-text-padding-default: 24px;
|
||||
--context-menu-text-padding: var(--context-menu-text-padding-default);
|
||||
--menu-background-padding-default: calc(
|
||||
var(--context-menu-background-padding) + var(--context-menu-text-padding)
|
||||
);
|
||||
|
|
@ -11279,7 +11295,8 @@
|
|||
@media (-moz-gtk-csd-available) {
|
||||
:root {
|
||||
--context-menu-background-padding: 1em;
|
||||
--context-menu-text-padding: 24px;
|
||||
--context-menu-text-padding-default: 24px;
|
||||
--context-menu-text-padding: var(--context-menu-text-padding-default);
|
||||
--menu-background-padding-default: calc(
|
||||
var(--context-menu-background-padding) + var(--context-menu-text-padding)
|
||||
);
|
||||
|
|
@ -11610,6 +11627,14 @@
|
|||
#PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
|
||||
padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
|
||||
}
|
||||
@supports -moz-bool-pref("userChrome.theme.non_native_menu") {
|
||||
menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
|
||||
menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
|
||||
#PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
|
||||
#PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
|
||||
margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
|
||||
}
|
||||
}
|
||||
menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
|
||||
menuitem:not(.menuitem-iconic, [disabled="true"])
|
||||
.menu-text,
|
||||
|
|
|
|||
6
css/leptonContent.css
generated
6
css/leptonContent.css
generated
|
|
@ -3131,7 +3131,8 @@
|
|||
@media (-moz-windows-non-native-menus) {
|
||||
:root {
|
||||
--context-menu-background-padding: 1em;
|
||||
--context-menu-text-padding: 24px;
|
||||
--context-menu-text-padding-default: 24px;
|
||||
--context-menu-text-padding: var(--context-menu-text-padding-default);
|
||||
--menu-background-padding-default: calc(
|
||||
var(--context-menu-background-padding) + var(--context-menu-text-padding)
|
||||
);
|
||||
|
|
@ -3153,7 +3154,8 @@
|
|||
@media (-moz-gtk-csd-available) {
|
||||
:root {
|
||||
--context-menu-background-padding: 1em;
|
||||
--context-menu-text-padding: 24px;
|
||||
--context-menu-text-padding-default: 24px;
|
||||
--context-menu-text-padding: var(--context-menu-text-padding-default);
|
||||
--menu-background-padding-default: calc(
|
||||
var(--context-menu-background-padding) + var(--context-menu-text-padding)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -85,6 +85,9 @@ $_bookmarkToolbarMenus: selector.nest(
|
|||
/* Bookmark Popup - None icon menu */
|
||||
@include _layoutBookmarkMenu() {
|
||||
padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
|
||||
@include Option("userChrome.theme.non_native_menu") {
|
||||
margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
|
||||
}
|
||||
|
||||
.menu-text {
|
||||
margin-inline-start: var(--context-menu-text-padding) !important;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,8 @@ $_initialMenus: selector.append(
|
|||
@mixin _layout_root_non_native() {
|
||||
:root {
|
||||
--context-menu-background-padding: 1em;
|
||||
--context-menu-text-padding: #{ 16px + 8px };
|
||||
--context-menu-text-padding-default: #{ 16px + 8px };
|
||||
--context-menu-text-padding: var(--context-menu-text-padding-default);
|
||||
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
|
||||
|
||||
--bookmark-menu-icon-align-padding: 0px;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
--menu-icon-opacity: 0.7;
|
||||
--nested-margin: -10px;
|
||||
--windows-panel-box-shadow: 0 0 4px hsla(0,0%,0%,.2);
|
||||
|
||||
--menu-checkbox-padding: 12px;
|
||||
@include Dark {
|
||||
/* Override the menu color variables for dark browser themes. */
|
||||
--menu-icon-opacity: 1;
|
||||
|
|
@ -63,7 +65,7 @@
|
|||
-moz-context-properties: fill, fill-opacity !important;
|
||||
fill: currentColor !important;
|
||||
fill-opacity: var(--menu-icon-opacity) !important;
|
||||
margin-inline-end: 1em !important;
|
||||
margin-inline-end: 1px !important;
|
||||
padding-top: 0 !important;
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +80,7 @@
|
|||
}
|
||||
|
||||
menulist > menupopup > menuitem {
|
||||
padding-inline-end: 1em !important;
|
||||
padding-inline-end: 1px !important;
|
||||
}
|
||||
|
||||
menupopup[needsgutter] menu:not([icon], .menu-iconic),
|
||||
|
|
@ -97,11 +99,21 @@
|
|||
|
||||
.menu-iconic > .menu-iconic-left,
|
||||
.menuitem-iconic > .menu-iconic-left {
|
||||
padding-inline-end: 0 !important;
|
||||
margin-inline-end: 8px !important;
|
||||
}
|
||||
|
||||
menuitem[type="checkbox"],
|
||||
menuitem[type="radio"] {
|
||||
--menu-background-padding-default: var(--menu-checkbox-padding);
|
||||
}
|
||||
menuitem[checked="true"] {
|
||||
padding-inline-start: 12px !important;
|
||||
padding-inline-start: var(--menu-checkbox-padding) !important;
|
||||
}
|
||||
|
||||
menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item .menu-iconic-left {
|
||||
padding-inline-end: 0 !important;
|
||||
margin-inline-end: 6px !important;
|
||||
}
|
||||
|
||||
/* We need to do something to override the default style for selected
|
||||
|
|
@ -142,10 +154,12 @@
|
|||
margin: -4px !important;
|
||||
}
|
||||
|
||||
menupopup > menuitem,
|
||||
menupopup > menu {
|
||||
padding-block: 0.5em !important;
|
||||
padding-inline-start: 1em !important;
|
||||
menupopup:not([placespopup="true"]) > {
|
||||
menuitem,
|
||||
menu {
|
||||
padding-block: var(--menu-padding, 0.5em) !important;
|
||||
padding-inline-start: 1em !important;
|
||||
}
|
||||
}
|
||||
.menupopup-arrowscrollbox[part*="content"] {
|
||||
box-shadow: var(--windows-panel-box-shadow) !important;
|
||||
|
|
@ -170,6 +184,10 @@
|
|||
}
|
||||
|
||||
//-- Browser -----------------------------------------------------------------
|
||||
#mainPopupSet {
|
||||
--menu-background-padding-default: calc( var(--context-menu-background-padding) + var(--context-menu-text-padding-default) );
|
||||
}
|
||||
|
||||
/* :not([hidden]) to avoid the display: flex unhiding the item. */
|
||||
#context-navigation:not([hidden]) {
|
||||
/* The Windows 10 version of the navigation area needs the scrollbox's
|
||||
|
|
@ -251,7 +269,6 @@
|
|||
width: calc(var(--menuitem-min-width) + calc(100% - 4 * var(--menuitem-min-width)) / 6) !important;
|
||||
}
|
||||
|
||||
|
||||
/* Other menu separators don't extend all the way to the menu edges, but the
|
||||
one below the navigation buttons in the content context menu should. */
|
||||
#context-sep-navigation {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue