зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1437052 - Consolidate #main-menubar > menu appearance and color rules. r=Felipe
MozReview-Commit-ID: 7RicXHVrbEQ --HG-- extra : rebase_source : 77be64b88176f7b125d1163a099c200cd8f8fd45
This commit is contained in:
Родитель
9211d7903a
Коммит
2317dd7150
|
@ -174,7 +174,7 @@
|
||||||
|
|
||||||
@media (-moz-windows-default-theme) {
|
@media (-moz-windows-default-theme) {
|
||||||
#main-menubar > menu {
|
#main-menubar > menu {
|
||||||
-moz-appearance: none;
|
color: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-menubar > menu[_moz-menuactive="true"],
|
#main-menubar > menu[_moz-menuactive="true"],
|
||||||
|
@ -267,22 +267,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (-moz-windows-default-theme) {
|
|
||||||
#main-menubar > menu:not(:-moz-lwtheme) {
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Use a different color only on Windows 8 and higher for inactive windows.
|
|
||||||
* On Win 7, the menubar fog disappears for inactive windows, and renders gray
|
|
||||||
* illegible.
|
|
||||||
*/
|
|
||||||
@media not all and (-moz-os-version: windows-win7) {
|
|
||||||
#toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
|
|
||||||
color: ThreeDShadow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[darkwindowframe="true"] .titlebar-color:not(:-moz-window-inactive):not(:-moz-lwtheme) {
|
:root[darkwindowframe="true"] .titlebar-color:not(:-moz-window-inactive):not(:-moz-lwtheme) {
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,26 @@
|
||||||
-moz-box-flex: 1; /* make menu items expand to fill toolbar height */
|
-moz-box-flex: 1; /* make menu items expand to fill toolbar height */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#main-menubar > menu {
|
||||||
|
-moz-appearance: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#main-menubar > menu:not([_moz-menuactive="true"]) {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Use a different color only on Windows 8 and higher in inactive windows.
|
||||||
|
* On Win 7, the menubar fog disappears for inactive windows, and renders gray
|
||||||
|
* illegible.
|
||||||
|
*/
|
||||||
|
@media (-moz-windows-default-theme) {
|
||||||
|
@media not all and (-moz-os-version: windows-win7) {
|
||||||
|
#toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
|
||||||
|
color: ThreeDShadow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Hides the titlebar-placeholder underneath the window caption buttons when we
|
/* Hides the titlebar-placeholder underneath the window caption buttons when we
|
||||||
are not autohiding the menubar. */
|
are not autohiding the menubar. */
|
||||||
#toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-placeholder[type="caption-buttons"] {
|
#toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-placeholder[type="caption-buttons"] {
|
||||||
|
@ -187,12 +207,6 @@
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-moz-window-dragging: drag;
|
-moz-window-dragging: drag;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Top-level menu appearance has transparent background, so the text color
|
|
||||||
needs to be inherited from our custom menubar too. */
|
|
||||||
#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче