X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fcustomizableui%2FpanelUIOverlay.css;h=047f512290ce4406fa7f3f7d44dafac9d9adebf0;hp=1d39611842d59a6d849c2bab3b3f0161c247418a;hb=7327c957c10aeaccf57a457a9950ac380a326f29;hpb=d1e87ec111b877e6c9a5311d7998ba4da9c156f7 diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 1d396118..047f5122 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -4,13 +4,18 @@ /* === BEGIN panelUIOverlay.inc.css === */ +:root { + --panel-ui-exit-subview-gutter-width: 38px; +} + #PanelUI-popup #PanelUI-contents:empty { height: 128px; } #PanelUI-popup #PanelUI-contents:empty::before { content: ""; - background-image: url("chrome://browser/skin/customizableui/whimsy-bw.png"); + background-image: url(chrome://browser/skin/customizableui/whimsy.png); + background-size: 64px 64px; display: block; width: 64px; height: 64px; @@ -20,6 +25,10 @@ whimsyMoveY 3.4s linear 0s infinite alternate; } +#PanelUI-popup #PanelUI-contents:not(:hover):empty::before { + filter: grayscale(100%); +} + #PanelUI-popup #PanelUI-contents:active:empty::before { animation: whimsyMoveX 3.05s linear 0s infinite alternate, whimsyMoveY 3.4s linear 0s infinite alternate, @@ -37,16 +46,8 @@ whimsyRotate 1s linear 0s infinite normal; } -#PanelUI-popup #PanelUI-contents:empty:hover::before { - background-image: url("chrome://browser/skin/customizableui/whimsy.png"); -} - @media (min-resolution: 2dppx) { #PanelUI-popup #PanelUI-contents:empty::before { - background-image: url("chrome://browser/skin/customizableui/whimsy-bw@2x.png"); - background-size: 64px 64px; - } - #PanelUI-popup #PanelUI-contents:empty:hover::before { background-image: url("chrome://browser/skin/customizableui/whimsy@2x.png"); } } @@ -81,9 +82,36 @@ #PanelUI-button:-moz-locale-dir(rtl) { } +#PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + display: -moz-box; + height: 10px; + width: 10px; + background-size: contain; + border: none; +} + +#PanelUI-menu-button[badge-status="update-succeeded"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #008484 url(chrome://browser/skin/update-badge.svg) no-repeat center; + height: 13px; +} + +#PanelUI-menu-button[badge-status="update-failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #FF0000 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center; + height: 13px; +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: transparent url(chrome://browser/skin/warning.svg) no-repeat center; + height: 13px; + box-shadow: none; +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { +} + .panel-subviews { padding: 4px; - -moz-margin-start: 38px; + -moz-margin-start: var(--panel-ui-exit-subview-gutter-width); } .panel-viewstack[viewtype="main"] > .panel-subviews { @@ -124,6 +152,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan margin: 0 0 4px; background-color: #A09090; color: #000000; + font-variant: small-caps; border-radius: 4px; } @@ -146,16 +175,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan border-radius: 4px; } -#app-extension-point-end > #PanelUI-menu-button { - padding: 2px 5px; -} -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-text { - display: none; -} -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-icon { - margin: 0; -} - #PanelUI-popup > arrowscrollbox > autorepeatbutton { display: none; } @@ -174,8 +193,8 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text { -/* line-height: 1.1;*/ - max-height: 2.2em; +/* line-height: 1.2;*/ + max-height: 2.4em; } .panelUI-grid .toolbarbutton-1:not([auto-hyphens="off"]) > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, @@ -186,7 +205,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text { position: absolute; - clip: rect(auto, auto, 2.3em, auto); + clip: rect(-0.1em, auto, 2.6em, auto); } .panelUI-grid .toolbarbutton-1 > .toolbarbutton-text, @@ -215,6 +234,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan max-width: 30em; } +/* Give WebExtension stand-alone panels extra width for Chrome compatibility */ +.cui-widget-panel[viewId^=PanelUI-webext-] .panel-mainview { + max-width: 800px; +} + panelview:not([mainview]) .toolbarbutton-text, .cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; @@ -239,7 +263,7 @@ panelview:not([mainview]) .toolbarbutton-text, #PanelUI-contents { display: block; - flex: 1 0 main-size; + flex: 1 0 auto; margin-left: auto; margin-right: auto; max-width: 22.35em; @@ -275,8 +299,10 @@ toolbarpaletteitem[place="panel"]:not([haswideitem=true]) > .toolbarbutton-1 { } /* Help SDK buttons fit in. */ -toolbarpaletteitem[place="palette"] > toolbarbutton[sdk-button="true"] > .toolbarbutton-icon, -toolbarbutton[sdk-button="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon { +toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-icon, +toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon, +toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon, +toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { height: 32px; width: 32px; } @@ -358,7 +384,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe { #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .panel-wide-item, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .toolbarbutton-1:not([panel-multiview-anchor="true"]), -#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-status, +#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-update-status, +#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-avatar, +#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-label, +#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-icon, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > toolbarseparator, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > #PanelUI-customize, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > #PanelUI-help:not([panel-multiview-anchor="true"]) { @@ -383,10 +412,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon, -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack, .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .customization-palette .toolbarbutton-1 > .toolbarbutton-icon, -.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack, .panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .panel-customization-placeholder-child > .toolbarbutton-icon { @@ -410,7 +439,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it /* above we treat the container as the icon for the margins, that is so the /* badge itself is positioned correctly. Here we make sure that the icon itself /* has the minum size we want, but no padding/margin. */ -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon { +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon { + width: 32px; + height: 32px; min-width: 32px; min-height: 32px; margin: 0; @@ -454,27 +486,79 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { border-bottom-left-radius: 4px; } -#PanelUI-footer-inner { +#main-window[customizing] #PanelUI-footer-fxa > toolbarseparator { + display: none; +} + +#PanelUI-footer-fxa:not([fxastatus="signedin"]) > toolbarseparator, +#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-icon, +#PanelUI-footer-fxa:not([fxaprofileimage]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar { + display: none; +} + +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status::after { + content: url("chrome://browser/skin/warning.svg"); + width: 47px; + padding-top: 1px; + display: block; + text-align: center; + position: relative; + top: 25%; +} + +#PanelUI-update-status[update-status]::after { + content: ""; + width: 14px; + height: 14px; + margin-right: 16.5px; + border-radius: 2px; + background-size: contain; + display: -moz-box; +} + +#PanelUI-update-status[update-status="succeeded"]::after { + background-image: url(chrome://browser/skin/update-badge.svg); + background-color: #008484; +} + +#PanelUI-update-status[update-status="failed"]::after { + background-image: url(chrome://browser/skin/update-badge-failed.svg); + background-color: #FF0000; +} + +#PanelUI-fxa-status { + display: flex; + flex: 1 1 0%; + width: 1px; +} + +#PanelUI-footer-inner, +#PanelUI-footer-fxa:not([hidden]) { display: flex; border-top: 1px solid #9C9CFF; } -#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner { +#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner, +#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-fxa { position: relative; } -#PanelUI-footer-inner > toolbarseparator { +#PanelUI-footer-inner > toolbarseparator, +#PanelUI-footer-fxa > toolbarseparator { border: 0; border-left: 1px solid #9C9CFF; margin: 0; } -#PanelUI-footer-inner:hover > toolbarseparator { +#PanelUI-footer-inner:hover > toolbarseparator, +#PanelUI-footer-fxa:hover > toolbarseparator { /* margin: 0;*/ } +#PanelUI-update-status, #PanelUI-help, -#PanelUI-fxa-status, +#PanelUI-fxa-label, +#PanelUI-fxa-icon, #PanelUI-customize, #PanelUI-quit { margin: 0; @@ -488,13 +572,13 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-box-orient: horizontal; } -#PanelUI-fxa-status { +#PanelUI-update-status { border-top: 1px solid #9C9CFF; border-bottom: 1px solid transparent; margin-bottom: -1px; } -#PanelUI-fxa-status > .toolbarbutton-text { +#PanelUI-update-status > .toolbarbutton-text { width: 0; /* Fancy cropping solution for flexbox. */ } @@ -507,7 +591,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { min-width: 44px; } -#PanelUI-fxa-status > .toolbarbutton-text, +#PanelUI-update-status > .toolbarbutton-text, +#PanelUI-fxa-label > .toolbarbutton-text, #PanelUI-customize > .toolbarbutton-text { margin: 0; padding: 0 6px; @@ -515,29 +600,146 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-help > .toolbarbutton-text, -#PanelUI-quit > .toolbarbutton-text { +#PanelUI-quit > .toolbarbutton-text, +#PanelUI-fxa-avatar > .toolbarbutton-text { display: none; } +#PanelUI-update-status > .toolbarbutton-icon, +#PanelUI-fxa-label > .toolbarbutton-icon, +#PanelUI-fxa-icon > .toolbarbutton-icon, +#PanelUI-customize > .toolbarbutton-icon, #PanelUI-help > .toolbarbutton-icon, #PanelUI-quit > .toolbarbutton-icon { -moz-margin-end: 0; } +#PanelUI-fxa-icon { + -moz-padding-start: 15px; + -moz-padding-end: 15px; +} + +#PanelUI-fxa-label, #PanelUI-customize { flex: 1; -moz-padding-start: 15px; -moz-border-start-style: none; } -#PanelUI-fxa-status { +#PanelUI-footer-fxa[fxaprofileimage="set"] > #PanelUI-fxa-status > #PanelUI-fxa-label, +#PanelUI-footer-fxa[fxaprofileimage="enabled"]:not([fxastatus="error"]) > #PanelUI-fxa-status > #PanelUI-fxa-label { + -moz-padding-start: 0px; +} + +#PanelUI-update-status { + width: calc(22.35em + 30px); + -moz-padding-start: 15px; + -moz-border-start-style: none; +} + +#PanelUI-update-status { + list-style-image: url(chrome://branding/content/icon16.png); +} + +#PanelUI-fxa-label, +#PanelUI-fxa-icon { list-style-image: url("chrome://browser/skin/syncFx-horizontalbar.png"); } -#PanelUI-fxa-status[status="active"] { +PanelUI-remotetabs-instruction-label, + +#PanelUI-remotetabs-mobile-promo { + margin: 15px; + text-align: center; + text-shadow: none; + max-width: 15em; + color: #A09090; +} + +/* The boxes with "instructions" get extra top and bottom padding for space + around the illustration and buttons */ +.PanelUI-remotetabs-instruction-box { + padding-bottom: 30px; + padding-top: 15px; +} + +.PanelUI-remotetabs-prefs-button { +/* + -moz-appearance: none; + background-color: #0096dd; + / !important for the color as an OSX specific rule when a lightweight theme + is used for buttons in the toolbox overrides. See bug 1238531 for details / + color: white !important; + border-radius: 2px; + margin-top: 10px; + margin-bottom: 10px; + padding: 8px; + text-shadow: none; +*/ + min-width: 200px; +} + +.PanelUI-remotetabs-prefs-button:hover, +.PanelUI-remotetabs-prefs-button:hover:active { +/* background-color: #018acb; */ +} + +.remotetabs-promo-link { + margin: 0; +} + +.PanelUI-remotetabs-notabsforclient-label { + color: #A09090; + /* This margin is to line this label up with the labels in toolbarbuttons. */ + margin-left: 28px; +} + +.fxaSyncIllustration { + width: 180px; + list-style-image: url(chrome://browser/skin/fxa/sync-illustration.svg); +} + +.PanelUI-remotetabs-prefs-button > .toolbarbutton-text { + /* !important to override ".cui-widget-panel toolbarbutton > .toolbarbutton-text" above. */ + text-align: center !important; + text-shadow: none; +} + +#PanelUI-remotetabs[mainview] { /* panel anchored to toolbar button might be too skinny */ + min-width: 19em; +} + +/* Work around bug 1224412 - these boxes will cause scrollbars to appear when + the panel is anchored to a toolbar button. +*/ +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane { + min-height: 33em; +} + +#PanelUI-remotetabs-tabslist > label[itemtype="client"] { + color: #A09090; +} + +/* Collapse the non-active vboxes in the remotetabs deck to use only the + height the active box needs */ +#PanelUI-remotetabs-deck:not([selectedIndex="1"]) > #PanelUI-remotetabs-tabsdisabledpane, +#PanelUI-remotetabs-deck:not([selectedIndex="2"]) > #PanelUI-remotetabs-fetching, +#PanelUI-remotetabs-deck:not([selectedIndex="3"]) > #PanelUI-remotetabs-nodevicespane { + visibility: collapse; +} + +#PanelUI-fxa-icon[syncstatus="active"] { list-style-image: url("chrome://browser/skin/syncFxProgress-horizontalbar.png"); } +#PanelUI-footer-fxa[fxastatus="migrate-signup"] > #PanelUI-fxa-status > #PanelUI-fxa-label, +#PanelUI-footer-fxa[fxastatus="migrate-verify"] > #PanelUI-fxa-status > #PanelUI-fxa-label { + list-style-image: url(chrome://browser/skin/warning.svg); +} + #PanelUI-customize { list-style-image: url("chrome://browser/skin/menuPanel-customize.png"); } @@ -555,13 +757,50 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url("chrome://browser/skin/menuPanel-exit.png"); } -#PanelUI-fxa-status, +#PanelUI-fxa-label, +#PanelUI-fxa-icon, #PanelUI-customize, #PanelUI-help, #PanelUI-quit { -moz-image-region: rect(0, 16px, 16px, 0); } +#PanelUI-footer-fxa[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon, +#PanelUI-footer-fxa[fxastatus="error"][fxaprofileimage="set"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon { + display: none; +} + +#PanelUI-footer-fxa[fxastatus="error"]:not([fxaprofileimage="set"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar { + display: none; +} + +#PanelUI-fxa-avatar[disabled], +#PanelUI-fxa-icon[disabled] { + display: none; +} + +#PanelUI-fxa-status[disabled] { + pointer-events: none; +} + +#PanelUI-fxa-avatar { + width: 32px; + height: 32px; + border-radius: 50%; + background-repeat: no-repeat; + background-position: 0 0; + background-size: contain; + align-self: center; + margin: 0px 7px; + padding: 0px; + border: 0px none; + -moz-margin-end: 0; +} + +#PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar { + list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg); +} + #PanelUI-customize:hover, #PanelUI-help:not([disabled]):hover, #PanelUI-quit:not([disabled]):hover, @@ -576,20 +815,65 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-image-region: rect(0, 48px, 16px, 32px); } -#PanelUI-fxa-status:not([disabled]):hover, +#PanelUI-fxa-icon:not([disabled]):hover, #PanelUI-help:not([disabled]):hover, #PanelUI-customize:hover, #PanelUI-quit:not([disabled]):hover { } -#PanelUI-fxa-status:not([disabled]):hover:active, +#PanelUI-fxa-icon:not([disabled]):hover:active, #PanelUI-help:not([disabled]):hover:active, #PanelUI-customize:hover:active, #PanelUI-quit:not([disabled]):hover:active { } #PanelUI-fxa-status:not([disabled]):hover, -#PanelUI-fxa-status:not([disabled]):hover:active { +#PanelUI-fxa-status:not([disabled]):hover:active, +#PanelUI-fxa-icon:not([disabled]):hover, +#PanelUI-fxa-icon:not([disabled]):hover:active { +} + +#PanelUI-footer-fxa[fxastatus="error"] { + background-color: #FF0000; + color: #000000; +} + +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover { + background-color: #FFCF00; +} + +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover:active { + background-color: #FF9F00; +} + +#PanelUI-update-status { +/* color: black; */ +} + +#PanelUI-update-status[update-status="succeeded"] { + background-color: #008484; + color: #000000; +} + +#PanelUI-update-status[update-status="succeeded"]:not([disabled]):hover { + background-color: #FFCF00; +} + +#PanelUI-update-status[update-status="succeeded"]:not([disabled]):hover:active { + background-color: #FF9F00; +} + +#PanelUI-update-status[update-status="failed"] { + background-color: #FF0000; + color: #000000; +} + +#PanelUI-update-status[update-status="failed"]:not([disabled]):hover { + background-color: #FFCF00; +} + +#PanelUI-update-status[update-status="failed"]:not([disabled]):hover:active { + background-color: #FF9F00; } #PanelUI-quit:not([disabled]):hover { @@ -626,6 +910,7 @@ panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, +.share-provider-button, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { /* padding: 0 6px; background-color: hsla(210,4%,10%,0); @@ -637,6 +922,7 @@ panelview .toolbarbutton-1, panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, +.share-provider-button, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { border-width: 0; } @@ -709,6 +995,7 @@ panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], +.share-provider-button:not(:-moz-any([disabled],[open],:active)):hover, .widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[checked="true"],[open],:active)):hover { @@ -724,6 +1011,7 @@ panelview .toolbarbutton-1:-moz-any(:not([disabled]):-moz-any([open],:hover:acti toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],:hover:active), menu.subviewbutton:not([disabled])[_moz-menuactive]:active, menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active, +.share-provider-button:not([disabled]):-moz-any([open],:hover:active), .widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],:hover:active), .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not([disabled]):-moz-any([open],:hover:active) { @@ -828,10 +1116,19 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), color: #A09090; } +#PanelUI-remotetabs-tabslist > toolbarbutton, #PanelUI-historyItems > toolbarbutton { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } +@media (min-resolution: 1.1dppx) { + #PanelUI-remotetabs-tabslist > toolbarbutton, + #PanelUI-historyItems > toolbarbutton { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png"); + } +} + +#PanelUI-remotetabs-tabslist > toolbarbutton > .toolbarbutton-icon, #PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon, #PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon, #PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon { @@ -858,7 +1155,7 @@ toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button position: absolute; top: 0; height: 100%; - width: 38px; + width: var(--panel-ui-exit-subview-gutter-width); background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); background-repeat: no-repeat; background-color: #008484; @@ -872,13 +1169,13 @@ toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button toolbarbutton[panel-multiview-anchor="true"] { background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); - background-position: right calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center; + background-position: right calc((22.35em / 3 - 0.1px) / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center; background-repeat: no-repeat; } toolbarbutton[panel-multiview-anchor="true"]:-moz-locale-dir(rtl) { background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png"); - background-position: left calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center; + background-position: left calc((22.35em / 3 - 0.1px) / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center; } toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker, @@ -1069,17 +1366,6 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { color: #FF9F00; } -#customizationui-widget-multiview[mainViewId="PanelUI-panicView"] > .panel-viewcontainer, -#customizationui-widget-multiview[mainViewId="PanelUI-panicView"] > .panel-viewcontainer > .panel-viewstack, -#customizationui-widget-multiview[mainViewId="PanelUI-panicView"] > .panel-viewcontainer > .panel-viewstack > .panel-mainview, -/* NB: currentsubview attribute is temporary as a safe workaround for a layout problem with this - * panel. Do not rely on it, it *will* go away again. */ -#PanelUI-multiView[currentsubview="PanelUI-panicView"] > .panel-viewcontainer > .panel-viewstack > .panel-subviews, -#PanelUI-panicView > .panel-subview-body, -#PanelUI-panicView { - overflow: visible; -} - #PanelUI-panicView.cui-widget-panelview { min-width: 280px; } @@ -1251,8 +1537,8 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { #BMB_bookmarksPopup menupopup[placespopup=true] > hbox { /* emulating chrome://browser/content/places/menu.xml#places-popup-arrow but without the arrow */ -/* background: #FFF; - border: 1px solid rgba(0,0,0,0.25); +/* background: var(--panel-arrowcontent-background); + border: var(--panel-arrowcontent-border); border-radius: 3.5px; margin-top: -4px;*/ } @@ -1279,6 +1565,12 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { margin-bottom: 2px;*/ } +.subviewbutton:-moz-any([image], .bookmark-item) > .toolbarbutton-icon { + /* This catches bookmarks, history items, and sync tabs items */ + width: 16px; + height: 16px; +} + /* Disabled empty item looks too small otherwise, because it has no icon. */ menuitem.subviewbutton[disabled]:not(.menuitem-iconic), /* Same for checkbox menu items, whose icons lose size due to -moz-appearance: none: */ @@ -1314,11 +1606,11 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { } .subviewbutton > .toolbarbutton-text { - -moz-padding-start: 16px; + padding-inline-start: 18px; /* 16px for icons plus the 2px spacing from the rule below */ } .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item) > .toolbarbutton-text { - -moz-padding-start: 0; + padding-inline-start: 2px; } /* subviewbutton entries for social sidebars have images that come from external @@ -1334,12 +1626,14 @@ toolbarbutton.social-provider-menuitem > .toolbarbutton-icon { } menu.subviewbutton > .menu-right { - list-style-image: url("chrome://global/skin/menu/menu-arrow.gif"); + list-style-image: url("chrome://global/skin/menu/menu-arrow.svg#arrow"); + /* Reset the rect we inherit from the button: */ + -moz-image-region: auto; } -menu.subviewbutton:hover > .menu-right, -menu.subviewbutton[_moz-menuactive="true"] > .menu-right { - list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif"); +menu.subviewbutton:not([disabled="true"]):hover > .menu-right, +menu.subviewbutton:not([disabled="true"])[_moz-menuactive="true"] > .menu-right { + list-style-image: url("chrome://global/skin/menu/menu-arrow.svg#arrow-hover"); } menu[disabled="true"].subviewbutton > .menu-right { - list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif"); + list-style-image: url("chrome://global/skin/menu/menu-arrow.svg#arrow-disabled"); }