This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch geckoview-99.0.1-11.0-1 in repository tor-browser.
commit 6947727e502cc11c454a639108477a8f15bb181e Author: Sam Foster sfoster@mozilla.com AuthorDate: Mon Mar 21 12:53:52 2022 -0700
Bug 1760175 - Backed out changeset 4fa01c5591b5 to revert the @anyPanel@ changes in panelUI.inc.css on v99/beta a=dmeehan --- .../themes/shared/customizableui/panelUI.inc.css | 28 ++++++++++++---------- browser/themes/shared/jar.inc.mn | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 44b0631c894b3..52878da2da71d 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -2,6 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+%filter substitution + +%define inAnyPanel :is(:not([cui-areatype="toolbar"]), [overflowedItem=true]) + :root { --panel-item-hover-bgcolor: var(--button-hover-bgcolor); --panel-item-active-bgcolor: var(--button-active-bgcolor); @@ -386,7 +390,7 @@ panelview[id^=PanelUI-webext-] { min-width: calc(var(--menu-panel-width) + 32px); }
-panelview .toolbaritem-combined-buttons > toolbarbutton > .toolbarbutton-icon { +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton > .toolbarbutton-icon { min-width: 0; min-height: 0; margin: 0; @@ -1222,12 +1226,10 @@ panelview .toolbarbutton-1 { margin-top: 6px; }
-:is( - panelview .toolbarbutton-1, - toolbarbutton.subviewbutton, - .widget-overflow-list .toolbarbutton-1, - panelview .toolbaritem-combined-buttons > toolbarbutton -):focus-visible { +panelview .toolbarbutton-1:focus-visible, +toolbarbutton.subviewbutton:focus-visible, +.widget-overflow-list .toolbarbutton-1:focus-visible, +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton:focus-visible { outline: var(--focus-outline); outline-offset: var(--focus-outline-inset); } @@ -1237,7 +1239,7 @@ panelview .toolbarbutton-1 { panelview .toolbarbutton-1, toolbarbutton.subviewbutton, .widget-overflow-list .toolbarbutton-1, - panelview .toolbaritem-combined-buttons > toolbarbutton + .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton ):not([disabled]):hover { color: inherit; background-color: var(--panel-item-hover-bgcolor); @@ -1248,7 +1250,7 @@ panelview .toolbarbutton-1 { panelview .toolbarbutton-1, toolbarbutton.subviewbutton, .widget-overflow-list .toolbarbutton-1, - panelview .toolbaritem-combined-buttons > toolbarbutton + .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton ):not([disabled]):hover:active { color: inherit; background-color: var(--panel-item-active-bgcolor); @@ -1387,7 +1389,7 @@ toolbarpaletteitem[place="palette"] > #search-container { max-height: 37px; }
-panelview .toolbaritem-combined-buttons > toolbarbutton { +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton { border: 0; margin: 0; -moz-box-flex: 1; @@ -1405,7 +1407,7 @@ toolbarpaletteitem[place="menu-panel"] > toolbaritem { display: none; }
-panelview .toolbaritem-combined-buttons > toolbarbutton:not(.toolbarbutton-1)[disabled] { +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton:not(.toolbarbutton-1)[disabled] { opacity: 0.4; /* Override toolbarbutton.css which sets the color to GrayText */ color: inherit; @@ -1416,7 +1418,7 @@ panelview .toolbaritem-combined-buttons > toolbarbutton:not(.toolbarbutton-1)[di min-width: calc(5ch + var(--toolbarbutton-inner-padding) * 2); }
-panelview .toolbaritem-combined-buttons > separator { +.toolbaritem-combined-buttons@inAnyPanel@ > separator { appearance: none; -moz-box-align: stretch; margin: .5em 0; @@ -1428,7 +1430,7 @@ panelview .toolbaritem-combined-buttons > separator { transition-timing-function: ease; }
-panelview .toolbaritem-combined-buttons:hover > separator { +.toolbaritem-combined-buttons@inAnyPanel@:hover > separator { margin: 0; }
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 71621d5f98aab..9e25fa92fd4c9 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -32,7 +32,7 @@ skin/classic/browser/controlcenter/panel.css (../shared/controlcenter/panel.css) skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg) skin/classic/browser/controlcenter/hero-message-background.svg (../shared/controlcenter/hero-message-background.svg) - skin/classic/browser/customizableui/panelUI.inc.css (../shared/customizableui/panelUI.inc.css) +* skin/classic/browser/customizableui/panelUI.inc.css (../shared/customizableui/panelUI.inc.css) skin/classic/browser/customizableui/empty-overflow-panel.png (../shared/customizableui/empty-overflow-panel.png) skin/classic/browser/customizableui/empty-overflow-panel@2x.png (../shared/customizableui/empty-overflow-panel@2x.png) skin/classic/browser/customizableui/density-compact.svg (../shared/customizableui/density-compact.svg)