From 51994fad8b1af94c4fcd94de0fd52425e4b14ff9 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 24 May 2014 00:41:04 +0200 Subject: [PATCH] sixth part of syncing LCARStrek with Firefox 29 windows theme changes --- LCARStrek/browser/browser.css | 142 +++++++++----- .../browser/customizableui/panelUIOverlay.css | 182 ++++++++++++++---- .../browser/customizableui/whimsy-bw.png | Bin 0 -> 4296 bytes .../browser/customizableui/whimsy-bw@2x.png | Bin 0 -> 11126 bytes LCARStrek/browser/customizableui/whimsy.png | Bin 0 -> 6639 bytes .../browser/customizableui/whimsy@2x.png | Bin 0 -> 18370 bytes LCARStrek/browser/privatebrowsing-dark.png | Bin 242 -> 0 bytes .../browser/privatebrowsing-indicator.png | Bin 242 -> 0 bytes LCARStrek/browser/privatebrowsing-light.png | Bin 185 -> 0 bytes .../browser/privatebrowsing-mask-tabstrip.png | Bin 0 -> 216 bytes .../browser/privatebrowsing-mask-titlebar.png | Bin 0 -> 170 bytes LCARStrek/global/menu.css | 2 +- 12 files changed, 236 insertions(+), 90 deletions(-) create mode 100644 LCARStrek/browser/customizableui/whimsy-bw.png create mode 100644 LCARStrek/browser/customizableui/whimsy-bw@2x.png create mode 100644 LCARStrek/browser/customizableui/whimsy.png create mode 100644 LCARStrek/browser/customizableui/whimsy@2x.png delete mode 100644 LCARStrek/browser/privatebrowsing-dark.png delete mode 100644 LCARStrek/browser/privatebrowsing-indicator.png delete mode 100644 LCARStrek/browser/privatebrowsing-light.png create mode 100644 LCARStrek/browser/privatebrowsing-mask-tabstrip.png create mode 100644 LCARStrek/browser/privatebrowsing-mask-titlebar.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index ef0aaa53..2a142754 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -415,11 +415,14 @@ menuitem.bookmark-item { /* === BEGIN toolbarbuttons.inc.css === */ /* Whole section of this included file: */ -:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, - #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, - #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, - #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, - #PanelUI-menu-button, #characterencoding-button, #email-link-button), +:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, + #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, + #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, + #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, + #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, + #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, + #copy-button, #paste-button, #e10s-button), + #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); } @@ -679,72 +682,72 @@ menuitem.bookmark-item { -moz-image-region: rect(18px, 486px, 36px, 468px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 504px, 36px, 486px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button[disabled="true"] { -moz-image-region: rect(36px, 504px, 54px, 486px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button { -moz-image-region: rect(0, 522px, 18px, 504px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 522px, 36px, 504px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button[disabled="true"] { -moz-image-region: rect(36px, 522px, 54px, 504px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button { -moz-image-region: rect(0, 540px, 18px, 522px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 540px, 36px, 522px); } -#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button[disabled="true"] { -moz-image-region: rect(36px, 540px, 54px, 522px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button { -moz-image-region: rect(0, 558px, 18px, 540px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover:not([disabled="true"]) { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 558px, 36px, 540px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button[disabled="true"] { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button[disabled="true"] { -moz-image-region: rect(36px, 558px, 54px, 540px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button { -moz-image-region: rect(0, 576px, 18px, 558px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover:not([disabled="true"]) { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 576px, 36px, 558px); } -#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button[disabled="true"] { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button[disabled="true"] { -moz-image-region: rect(36px, 576px, 54px, 558px); } -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) { +#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) { -moz-image-region: rect(0, 594px, 18px, 576px); } -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)):hover, -#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem))[open="true"] { +#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])):hover, +#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]))[open="true"] { -moz-image-region: rect(18px, 594px, 36px, 576px); } @@ -791,6 +794,7 @@ menuitem.bookmark-item { /* Menu panel and palette styles */ +toolbaritem[sdkstylewidget="true"] > toolbarbutton, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, @@ -1060,84 +1064,84 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton { /* Wide panel control icons */ -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton, toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton { list-style-image: url("chrome://browser/skin/menuPanel-small.png"); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button, +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button, toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button { -moz-image-region: rect(0px, 32px, 16px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button:hover:not([disabled="true"]), +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button:hover:not([disabled="true"]), toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 32px, 32px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button[disabled="true"], +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button[disabled="true"], toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button[disabled="true"] { -moz-image-region: rect(32px, 32px, 48px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button, +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button, toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button { -moz-image-region: rect(0px, 48px, 16px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button:hover:not([disabled="true"]), +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button:hover:not([disabled="true"]), toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 48px, 32px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button[disabled="true"], +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button[disabled="true"], toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button[disabled="true"] { -moz-image-region: rect(32px, 48px, 48px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button, +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button, toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button { -moz-image-region: rect(0px, 64px, 16px, 48px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button:hover:not([disabled="true"]), +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button:hover:not([disabled="true"]), toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 64px, 32px, 48px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button[disabled="true"], +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button[disabled="true"], toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button[disabled="true"] { -moz-image-region: rect(32px, 64px, 48px, 48px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button, +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button, toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button { -moz-image-region: rect(0px, 80px, 16px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button:hover:not([disabled="true"]), +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button:hover:not([disabled="true"]), toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 80px, 32px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button[disabled="true"], +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button[disabled="true"], toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button[disabled="true"] { -moz-image-region: rect(32px, 80px, 48px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button, +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button, toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { -moz-image-region: rect(0px, 96px, 16px, 80px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button:hover:not([disabled="true"]), +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button:hover:not([disabled="true"]), toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 96px, 32px, 80px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button[disabled="true"], +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button[disabled="true"], toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] { -moz-image-region: rect(32px, 96px, 48px, 80px); } @@ -4436,27 +4440,61 @@ toolbarpaletteitem[place="toolbar"] { /* End customization mode */ -#main-window[privatebrowsingmode=temporary] #toolbar-menubar { - background-image: url("chrome://browser/skin/privatebrowsing-dark.png"); - background-position: top right; - background-repeat: no-repeat; +/* Private browsing indicators */ + +/** + * Currently, we have two places where we put private browsing indicators on + * Windows. When tabsintitlebar is enabled, we draw the indicator in the titlebar. + * When tabsintitlebar is disabled, we draw the indicator at the end of the + * tabstrip. The titlebar indicator is the fiddliest of the bunch, since we + * want the bottom border of the image to line up with the bottom of the window + * caption buttons. That's why there's so much special-casing going on in here. + */ +.private-browsing-indicator { + display: none; + pointer-events: none; } -#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) { - background-position: top left; +#private-browsing-indicator-titlebar { + display: block; + position: absolute; } -#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon { - list-style-image: url("chrome://browser/skin/privatebrowsing-light.png"); - width: 20px; - height: 16px; +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator { + display: block; } -#main-window[privatebrowsingmode=temporary] #private-browsing-indicator { +#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator { + display: -moz-box; +} + +#TabsToolbar > .private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px; + -moz-margin-start: 4px; + width: 48px; +} + +/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen + * mode, since the tabstrip "mimics" the titlebar in that case with its own + * min/max/close window buttons. + */ +#private-browsing-indicator-titlebar > .private-browsing-indicator, +#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px; + -moz-margin-end: 4px; width: 40px; - background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center; + height: 20px; + position: relative; } +/* This one is for Linux */ +#main-window[privatebrowsingmode=temporary] #private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") center no-repeat; + width: 48px; +} + +/* End private browsing indicators */ + /* === BEGIN UITour.inc.css === */ /* UI Tour */ diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 0944a95e..b352c18a 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -4,6 +4,44 @@ /* === BEGIN panelUIOverlay.inc.css === */ +#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; + animation: moveX 3.05s linear 0s infinite alternate, + moveY 3.4s linear 0s infinite alternate; +} + +#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 moveX { + /* These values are adjusted for the padding on the panel. */ + from { margin-left: -15px; } to { margin-left: calc(100% - 49px); } +} +@keyframes moveY { + /* These values are adjusted for the padding and height of the panel. */ + from { margin-top: -6px; } to { margin-top: 58px; } +} + #customization-panelHolder { border-radius: 4px; } @@ -29,6 +67,10 @@ 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; } @@ -101,7 +143,7 @@ padding: .5em 0; } -.panelUI-grid .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text { margin: 2px 0 0; text-align: center; @@ -113,10 +155,13 @@ -moz-margin-start: 0; } -#PanelUI-contents, +#PanelUI-contents { + max-width: 22.35em; +} + #BMB_bookmarksPopup, .panel-mainview:not([panelid="PanelUI-popup"]) { - max-width: 22.35em; + max-width: 30em; } panelview:not([mainview]) .toolbarbutton-text, @@ -149,7 +194,7 @@ panelview:not([mainview]) .toolbarbutton-text, flex: auto; } -.toolbaritem-combined-buttons:-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; @@ -306,8 +351,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-margin-end: 2px; } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-reset-button { +#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; @@ -495,7 +540,7 @@ panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, -.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { /* padding: 2px 6px; background-color: hsla(210,4%,10%,0); border-radius: 2px; @@ -508,20 +553,34 @@ panelview .toolbarbutton-1, panelview .toolbarbutton-1, .subviewbutton, .widget-overflow-list .toolbarbutton-1, -.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { border-width: 0; } .subviewbutton.panel-subview-footer { - border-radius: 0; +/* border-radius: 0;*/ border: none; } -.subviewbutton.panel-subview-footer > .toolbarbutton-text, .subviewbutton.panel-subview-footer > .menu-text { - -moz-padding-start: 0; - -moz-padding-end: 12px; + -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) { @@ -535,6 +594,22 @@ panelview .toolbarbutton-1, /* font-size: 1.1em;*/ } +.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