зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1851689 - Make menu items more round on Windows. r=desktop-theme-reviewers,dao
Just like we do on Linux. Differential Revision: https://phabricator.services.mozilla.com/D188801
This commit is contained in:
Родитель
11ddb81ba4
Коммит
e7bc47985e
|
@ -10,7 +10,3 @@ menupopup::part(drop-indicator) {
|
||||||
/* To account for the shadow margin + border of the panel */
|
/* To account for the shadow margin + border of the panel */
|
||||||
margin-inline-start: 5px;
|
margin-inline-start: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbar-menupopup {
|
|
||||||
--nested-margin: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) + var(--panel-shadow-margin)));
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,9 +23,9 @@ menucaption {
|
||||||
border-radius: calc(var(--panel-border-radius) / 2);
|
border-radius: calc(var(--panel-border-radius) / 2);
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
list-style-image: none;
|
||||||
padding: 4px 6px;
|
padding: 4px 6px;
|
||||||
max-width: 42em;
|
max-width: 42em;
|
||||||
list-style-image: none;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
menu:where([_moz-menuactive]:not([disabled="true"])),
|
menu:where([_moz-menuactive]:not([disabled="true"])),
|
||||||
|
|
|
@ -35,7 +35,6 @@ panel {
|
||||||
@media (-moz-platform: windows) {
|
@media (-moz-platform: windows) {
|
||||||
--panel-border-radius: 4px;
|
--panel-border-radius: 4px;
|
||||||
--panel-padding-block: 4px;
|
--panel-padding-block: 4px;
|
||||||
--nested-margin: -10px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (-moz-platform: linux) or (-moz-platform: windows) {
|
@media (-moz-platform: linux) or (-moz-platform: windows) {
|
||||||
|
@ -103,7 +102,7 @@ panel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (-moz-platform: linux) {
|
@media (-moz-platform: linux) or (-moz-platform: windows) {
|
||||||
menupopup {
|
menupopup {
|
||||||
/* Also apply the padding in the inline axis for menus */
|
/* Also apply the padding in the inline axis for menus */
|
||||||
--panel-padding: var(--panel-padding-block);
|
--panel-padding: var(--panel-padding-block);
|
||||||
|
@ -129,11 +128,6 @@ panel {
|
||||||
padding-block: 0.5em;
|
padding-block: 0.5em;
|
||||||
padding-inline-start: 1em;
|
padding-inline-start: 1em;
|
||||||
}
|
}
|
||||||
menupopup > menu > menupopup {
|
|
||||||
/* TODO: Somehow unify with Linux and macOS above? */
|
|
||||||
margin-top: var(--nested-margin);
|
|
||||||
margin-inline-start: var(--nested-margin);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rules for popups associated with menulists */
|
/* rules for popups associated with menulists */
|
||||||
|
|
|
@ -20,8 +20,9 @@ menubar {
|
||||||
menu,
|
menu,
|
||||||
menuitem,
|
menuitem,
|
||||||
menucaption {
|
menucaption {
|
||||||
flex-shrink: 0;
|
border-radius: calc(var(--panel-border-radius) / 2);
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex-shrink: 0;
|
||||||
list-style-image: none;
|
list-style-image: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче