X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fcustomizableui%2FpanelUIOverlay.css;h=9ae0fbc500b8ecd2fc24d57b059f09db5d30ac50;hp=ad6b718b5a776568dc502131a4850cdb2143c1a6;hb=b1dfcf3228675c75fda183c9cd0161c9be5d4047;hpb=00f971bcdc3c62e89cac2618464efbad925b40bb diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index ad6b718b..9ae0fbc5 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -4,45 +4,178 @@ /* === 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"); + display: block; + width: 64px; + height: 64px; + position: absolute; + transition: transform 1s ease-out; + animation: whimsyMoveX 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate; +} + +#PanelUI-popup #PanelUI-contents:active:empty::before { + animation: whimsyMoveX 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate, + whimsyRotate 1s linear 0s infinite normal; +} + +#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):empty::before { + animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate; +} + +#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):active:empty::before { + animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate, + 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"); + } +} + +@keyframes whimsyMoveX { + /* These values are adjusted for the padding on the panel. */ + from { margin-left: -9px; } to { margin-left: calc(100% - 55px); } +} + +@keyframes whimsyMoveXRTL { + /* These values are adjusted for the padding on the panel. */ + from { margin-right: -9px; } to { margin-right: calc(100% - 55px); } +} + +@keyframes whimsyMoveY { + /* These values are adjusted for the padding and height of the panel. */ + from { margin-top: -.5em; } to { margin-top: calc(64px - .5em); } +} + +@keyframes whimsyRotate { + to { transform: perspective(5000px) rotateY(360deg); } +} + #customization-panelHolder { border-radius: 4px; } -.panel-subviews { - background-color: #000000; - -moz-margin-start: 38px; +#PanelUI-button { + -moz-margin-start: 3px; +} + +#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; } -.panel-subviews:-moz-locale-dir(rtl) { +#PanelUI-menu-button[badge-status="update-succeeded"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background-image: url(chrome://browser/skin/update-badge.svg); + background-color: #008484; +} + +#PanelUI-menu-button[badge-status="update-failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background-image: url(chrome://browser/skin/update-badge-failed.svg); + background-color: #FF0000; +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background-color: transparent; + background-image: url(chrome://browser/skin/warning.svg); + 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: var(--panel-ui-exit-subview-gutter-width); } .panel-viewstack[viewtype="main"] > .panel-subviews { - transform: translateX(21em); + transform: translateX(22.35em); } .panel-viewstack[viewtype="main"] > .panel-subviews:-moz-locale-dir(rtl) { - transform: translateX(-21em); + transform: translateX(-22.35em); +} + +panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .panel-subviews { + display: none; } .panel-viewstack:not([viewtype="main"]) > .panel-mainview > #PanelUI-mainView { -moz-box-flex: 1; } -#PanelUI-mainView { - background-color: #000000; - display: flex; - flex-direction: column; +.panel-subview-body { + overflow-y: auto; + overflow-x: hidden; + -moz-box-flex: 1; +} + +#PanelUI-popup .panel-subview-body { + margin: -4px; + padding: 4px 4px; +} + +.panel-subview-header, +.subviewbutton.panel-subview-footer { + box-sizing: border-box; +/* min-height: 41px; */ + padding: 3px; +} + +.panel-subview-header { + margin: 0 0 4px; + background-color: #A09090; + color: #000000; + font-variant: small-caps; border-radius: 4px; } -#app-extension-point-end > #PanelUI-menu-button { - padding: 2px 5px; +.panel-subview-footer { + border-top: 1px solid #A09090; } -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-text { + +.cui-widget-panelview .panel-subview-header { display: none; } -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-icon { - margin: 0; + +.cui-widget-panelview .subviewbutton.panel-subview-footer { + margin: 4px 0 0; + -moz-box-pack: center; +} + +#PanelUI-mainView { + display: flex; + flex-direction: column; + border-radius: 4px; } #PanelUI-popup > arrowscrollbox > autorepeatbutton { @@ -61,13 +194,33 @@ padding: .5em 0; } -toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text, -#bookmarks-menu-button > toolbarbutton > .toolbarbutton-text, -:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarpaletteitem > toolbaritem > toolbarbutton > .toolbarbutton-text, -:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbaritem > toolbarbutton > .toolbarbutton-text, -:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarpaletteitem > toolbarbutton > .toolbarbutton-text, -:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarbutton > .toolbarbutton-text { - font-size: 10px; +.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; +} + +.panelUI-grid .toolbarbutton-1:not([auto-hyphens="off"]) > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, +.panelUI-grid .toolbarbutton-1:not([auto-hyphens="off"]) > .toolbarbutton-multiline-text { + -moz-hyphens: auto; +} + +.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); +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-text, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text { + text-align: center; + /* Need to override toolkit theming which sets margin: 0 !important; */ + margin: 2px 0 0 !important; +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text { + text-align: center; + margin: -1px 0 0; } #wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls, @@ -75,109 +228,249 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it -moz-margin-start: 0; } -#PanelUI-contents, +#PanelUI-contents { + max-width: 22.35em; +} + +#BMB_bookmarksPopup, .panel-mainview:not([panelid="PanelUI-popup"]) { - max-width: 21em; + max-width: 30em; +} + +/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */ +panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) { + max-width: 33em; /* standaloneSubviewWidth + 3 */ } panelview:not([mainview]) .toolbarbutton-text, -#customizationui-widget-panel toolbarbutton > .toolbarbutton-text { +.cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; - -moz-padding-start: 8px; display: -moz-box; } +.cui-widget-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; +} + +.cui-widget-panel[viewId="PanelUI-pocketView"] > .panel-arrowcontainer > .panel-arrowcontent { + padding-top: 0; + padding-bottom: 0; +} + +.cui-widget-panel.cui-widget-panelWithFooter > .panel-arrowcontainer > .panel-arrowcontent { + padding-bottom: 0; +} + +.cui-widget-panel > :-moz-any(menu,menuitem,toolbarbutton):first-child { + border-radius: 4px 4px 0 0; +} + +.cui-widget-panel > :-moz-any(menu,menuitem,toolbarbutton):last-child { + border-radius: 0 0 4px 4px; +} + #PanelUI-contents { display: block; - flex: auto; + flex: 1 0 auto; margin-left: auto; margin-right: auto; - max-width: 21em; + max-width: 22.35em; } #PanelUI-contents-scroller { overflow-y: auto; overflow-x: hidden; - width: 21em; - padding-left: 5px; - padding-right: 5px; + width: 22.35em; flex: auto; } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton > .toolbarbutton-icon, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton > .toolbarbutton-icon { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton > .toolbarbutton-icon { min-width: 0; min-height: 0; margin: 0; } toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item), -#PanelUI-contents toolbarbutton, -toolbarpaletteitem[place="panel"] > toolbarbutton, -toolbarpaletteitem[place="palette"] > toolbarbutton, -toolbarpaletteitem[place="panel"] > toolbaritem > toolbarbutton, -toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton, -.panel-customization-placeholder { +.panelUI-grid .toolbarbutton-1, +.panel-customization-placeholder-child { -moz-appearance: none; -moz-box-orient: vertical; - min-width: 7em; - max-width: 7em; - height: 6em; - max-height: 6em; + width: calc(22.35em / 3 - 0.1px - 2px); /* LCARStrek: XXX: found out to be needed to fit the icons */ + height: calc(51px + 2.2em); +} + +/* In order to have button labels constrained appropriately, items inside the toolbarpaletteitem + * should have a min-width set so they abide by the width set above (which they do outside of + * customize mode because they're in a flexed container) */ +toolbarpaletteitem[place="panel"]:not([haswideitem=true]) > .toolbarbutton-1 { + min-width: 0.01px; +} + +/* Help SDK buttons fit in. */ +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; +} + +.customization-palette .toolbarbutton-1 { + -moz-appearance: none; + -moz-box-orient: vertical; +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button { + -moz-appearance: none; + -moz-box-orient: vertical; + width: calc(22.35em / 3 - 0.1px - 2px); + height: calc(49px + 2.2em); + border: 0; +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text { + margin-top: 2px; /* Hack needed to get the label of type=menu-button aligned with other buttons */ +} + +.panel-customization-placeholder-child { + margin: 6px 0 0; +/* padding: 2px 6px;*/ +} + +.panelUI-grid .toolbarbutton-1[type="menu"] { + background-image: url("chrome://global/skin/arrow/arrow-down-sharp.gif"); + background-position: right 3px top 16px; + background-repeat: no-repeat; +} + +.panelUI-grid .toolbarbutton-1[type="menu"]:-moz-locale-dir(rtl) { + background-position: left 3px top 16px; +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { + display: none; +} + +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { + -moz-box-align: center; + width: 16px; + -moz-margin-start: -16px; + height: 51px; + margin-bottom: 2.2em; padding: 0; - margin: 0; } -.panel-customization-placeholder[expand], -.panel-customization-placeholder[contract] { - transition-property: width; - transition-duration: 170ms; - transition-delay: 20ms; - transition-timing-function: ease-in-out; - min-width: 0; - max-width: none; +.panelUI-grid .toolbarbutton-1:not([buttonover]):not([disabled]):-moz-any([open],:hover:active) > .toolbarbutton-menubutton-dropmarker { + border-radius: 0 0 0 2px; } -.panel-combined-button[disabled] > .toolbarbutton-icon { +.panelUI-grid .toolbarbutton-1:not([buttonover]):not([disabled]):-moz-any([open],:hover:active)> .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) { + border-radius: 0 0 2px 0; +} + +#main-window:not([customizing]) .panel-combined-button[disabled] > .toolbarbutton-icon { /* opacity: .5; */ } -toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] { - width: 7em; +toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) { + width: calc(22.35em / 3 - 0.1px); margin: 0 !important; } -toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-widget) { +toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) { -moz-box-align: center; -moz-box-pack: center; } toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe { - margin: calc(5em / 12) auto; + margin: 4px auto; +} + +#PanelUI-multiView[viewtype="subview"] > .panel-viewcontainer > .panel-viewstack > .panel-mainview > #PanelUI-mainView { +} + +#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-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"]) { + opacity: .5; +} + +/* + * XXXgijs: this is a workaround for a layout issue that was caused by these iframes, + * which was affecting subview display. Because of this, we're hiding the iframe *only* + * when displaying a subview. The discerning user might notice this, but it's not nearly + * as bad as the brokenness. + * This hack should be removed once https://bugzilla.mozilla.org/show_bug.cgi?id=975375 + * is addressed. + */ +#PanelUI-multiView[viewtype="subview"] toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > iframe { + visibility: hidden; } toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text { text-align: center; } -.panel-customization-placeholder-child > .toolbarbutton-icon, -#bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -toolbarbutton[cui-areatype="menu-panel"] > .toolbarbutton-icon, -toolbaritem[cui-areatype="menu-panel"] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > #bookmarks-menu-button > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton > .toolbarbutton-icon { - min-width: calc(8em / 3); - min-height: calc(8em / 3); - margin: calc(5em / 12); +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon, +.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-stack, +.panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon, +.customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon, +.panel-customization-placeholder-child > .toolbarbutton-icon { + min-width: 32px; + min-height: 32px; + /* Explanation for the below formula (A / B - C) + A + Each button is 22.35em / 3 - 0.1px wide + B + Each button has two margins. + C (44px / 2 = 22px) + The button icon is 32 pixels wide. + The button has 12px of horizontal padding (6 on each side). + The button has 0px of horizontal border (0 on each side). + Total width of button's icon + button padding should therefore be 44px, + which means each horizontal margin should be the half the button's width - (44/2) px. + */ + margin: 4px calc((22.35em / 3 - 0.1px) / 2 - 22px); +} + +/* 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-stack > .toolbarbutton-icon, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon { + width: 32px; + height: 32px; + min-width: 32px; + min-height: 32px; + margin: 0; + padding: 0; } toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-box-flex: 1; } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-reset-button { +#personal-bookmarks[overflowedItem=true] > #bookmarks-toolbar-placeholder { + -moz-box-flex: 1; +} + +#personal-bookmarks[cui-areatype="toolbar"][overflowedItem=true] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { + -moz-margin-end: 2px; +} + +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button, +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-reset-button { border-left: none; border-right: none; border-radius: 0; @@ -191,55 +484,193 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-footer { display: flex; - border-top: 1px solid #9C9CFF; + flex-shrink: 0; + flex-direction: column; +/* background-color: hsla(210,4%,10%,.07);*/ padding: 0; margin: 0; - min-height: 4em; +/* min-height: 4em;*/ border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } +#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-fxa { + position: relative; +} + +#PanelUI-footer-inner > toolbarseparator, +#PanelUI-footer-fxa > toolbarseparator { + border: 0; + border-left: 1px solid #9C9CFF; + margin: 0; +} + +#PanelUI-footer-inner:hover > toolbarseparator, +#PanelUI-footer-fxa:hover > toolbarseparator { +/* margin: 0;*/ +} + +#PanelUI-update-status, #PanelUI-help, +#PanelUI-fxa-label, +#PanelUI-fxa-icon, #PanelUI-customize, #PanelUI-quit { margin: 0; - padding: 10px 0; - -moz-appearance: none; + padding: 11px 0; + box-sizing: border-box; + min-height: 40px; box-shadow: none; - background-image: none; - border: 1px solid transparent; - border-bottom-style: none; + border: none; border-radius: 0; transition: background-color; -moz-box-orient: horizontal; } +#PanelUI-update-status { + border-top: 1px solid #9C9CFF; + border-bottom: 1px solid transparent; + margin-bottom: -1px; +} + +#PanelUI-update-status > .toolbarbutton-text { + width: 0; /* Fancy cropping solution for flexbox. */ +} + +#PanelUI-help[panel-multiview-anchor="true"] { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + #PanelUI-help, #PanelUI-quit { - min-width: 46px; + min-width: 44px; } +#PanelUI-update-status > .toolbarbutton-text, +#PanelUI-fxa-label > .toolbarbutton-text, #PanelUI-customize > .toolbarbutton-text { + margin: 0; + padding: 0 6px; text-align: start; } #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-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-footer-fxa[syncstatus="active"] > #PanelUI-fxa-icon { + 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"); } +#customization-panelHolder #PanelUI-customize { + list-style-image: url("chrome://browser/skin/customizableui/menuPanel-customizeFinish.png"); +} + #PanelUI-help { list-style-image: url("chrome://browser/skin/menuPanel-help.png"); } @@ -249,12 +680,50 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url("chrome://browser/skin/menuPanel-exit.png"); } +#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, @@ -269,84 +738,238 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-image-region: rect(0, 48px, 16px, 32px); } +#PanelUI-fxa-icon:not([disabled]):hover, #PanelUI-help:not([disabled]):hover, #PanelUI-customize:hover, #PanelUI-quit:not([disabled]):hover { -/* border-color: rgba(8,25,42,0.2); - border-top-color: rgba(8,25,42,0.1); - background-color: rgba(0,0,0,0.1); - box-shadow: none;*/ } -#main-window[customize-entered] #PanelUI-customize { - color: #FFCF00; - background-color: #008484; +#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-icon:not([disabled]):hover, +#PanelUI-fxa-icon:not([disabled]):hover:active { } -#main-window[customize-entered] #PanelUI-customize:hover, -#main-window[customize-entered] #PanelUI-customize:hover:active { +#PanelUI-footer-fxa[fxastatus="error"] { + background-color: #FF0000; color: #000000; - background-color: #FFCF00; } -#customization-palette .toolbarbutton-text { - display: none; +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover { + background-color: #FFCF00; } -panelview toolbarbutton, -#widget-overflow-list > toolbarbutton, -.customizationmode-button, -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, -#BMB_bookmarksPopup > menu, -#BMB_bookmarksPopup > menuitem { - -moz-appearance: none; - padding: 2px 6px; -/* background-color: hsla(210,4%,10%,0); - border-radius: 2px; - border: 1px solid; - border-color: hsla(210,4%,10%,0);*/ - transition-property: background-color, border-color; - transition-duration: 150ms; +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover:active { + background-color: #FF9F00; } -panelview .toolbarbutton-1, -#widget-overflow-list > toolbarbutton { - margin-top: 6px; +#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 { + background-color: #FF0000; +} + +#PanelUI-quit:not([disabled]):hover:active { + background-color: #FF9F00; +} + +#customization-panelHolder #PanelUI-customize { + color: #FFCF00; + background-color: #008484; + text-shadow: none; + margin-top: -1px; +} + +#customization-panelHolder #PanelUI-customize + toolbarseparator { + display: none; +} + +#customization-panelHolder #PanelUI-customize:hover, +#customization-panelHolder #PanelUI-customize:hover:active { + background-color: #FFCF00; + color: #000000; +} + +#customization-palette .toolbarbutton-multiline-text, +#customization-palette .toolbarbutton-text { + display: none; +} + +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); + border-radius: 2px; + border-style: solid; + border-color: hsla(210,4%,10%,0);*/ +} + +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; +} + +.subviewbutton.panel-subview-footer { +/* border-radius: 0; */ + margin: 2px 0 0; +} + +.subviewbutton.panel-subview-footer > .menu-text { + -moz-margin-start: 0px !important; + -moz-padding-start: 6px; + -moz-padding-end: 6px; + -moz-box-flex: 0; + text-align: center; +} + +.subviewbutton.panel-subview-footer > .toolbarbutton-icon { + margin: 0; +} + +.subviewbutton.panel-subview-footer > .toolbarbutton-text { + text-align: center; + padding: 0; +} + +.subviewbutton.panel-subview-footer > .menu-accel-container { + -moz-padding-start: 6px; +} + +.subviewbutton:not(.panel-subview-footer) { + margin: 0; +} + +.subviewbutton:not(.panel-subview-footer) > .toolbarbutton-text, +/* Bookmark items need a more specific selector. */ +.PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-text, +.PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-iconic-text { +/* font: menu;*/ +} + +.PanelUI-subView .subviewbutton[shortcut]::after { + content: attr(shortcut); + float: right; + color: #A09090; +} + +.PanelUI-subView.cui-widget-panelview .subviewbutton[shortcut]::after { + -moz-margin-start: 10px; +} + +/* This is a