From: Robert Kaiser Date: Sun, 25 May 2014 19:02:21 +0000 (+0200) Subject: seventh part of syncing LCARStrek with Firefox 29 windows theme changes X-Git-Tag: LCARStrek-2.26~1 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=5401f433c81e15242767be2df7f86a5c7d99a86d;ds=sidebyside seventh part of syncing LCARStrek with Firefox 29 windows theme changes --- diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 2a142754..a733193e 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -127,11 +127,11 @@ menubar { } /* Make the menu inherit the toolbar's color. On non-compositor (Aero Basic, XP modern, classic) - * this is defined above. Otherwise (Aero Glass, Windows 8 inactive windows), this is hardcoded - * to black in browser-aero.css. */ -#main-menubar > menu:not(:-moz-lwtheme) { -/* color: inherit;*/ -} + * this is defined above, but only for tabsintitlebar. Otherwise (Aero Glass, Windows 8), + * this is hardcoded to black in browser-aero.css, even without tabsintitlebar. */ + #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) { +/* color: inherit; */ + } #nav-bar { /* Position the toolbar above the bottom of background tabs */ @@ -563,6 +563,19 @@ menuitem.bookmark-item { -moz-image-region: rect(18px, 270px, 36px, 252px); } +#sync-button[cui-areatype="toolbar"][status="active"], +#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) { + list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); + -moz-image-region: rect(0, 18px, 18px, 0px); +} + +/* +#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext, +#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) { + list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); +} +*/ + #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -795,16 +808,20 @@ 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, - #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)[cui-areatype="menu-panel"], -toolbarpaletteitem[place="palette"] > :-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)[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > :-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) { list-style-image: url("chrome://browser/skin/menuPanel.png"); } @@ -896,6 +913,11 @@ toolbarpaletteitem[place="palette"] > #sync-button:hover { -moz-image-region: rect(32px, 384px, 64px, 352px); } +#sync-button[cui-areatype="menu-panel"][status="active"] { + list-style-image: url("chrome://browser/skin/syncProgress-menuPanel.png"); + -moz-image-region: rect(0px, 32px, 32px, 0px); +} + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); @@ -950,6 +972,16 @@ toolbarpaletteitem[place="palette"] > #new-window-button:hover { -moz-image-region: rect(32px, 512px, 64px, 480px); } +#e10s-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #e10s-button { + -moz-image-region: rect(0px, 512px, 32px, 480px); +} + +#e10s-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #e10s-button:hover { + -moz-image-region: rect(32px, 512px, 64px, 480px); +} + #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 544px, 32px, 512px); @@ -1338,7 +1370,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o #forward-button > .toolbarbutton-icon { background-clip: padding-box !important; /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ - /*clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path) !important;*/ + /*clip-path: url(chrome://browser/content/browser.xul#keyhole-forward-clip-path) !important;*/ } #forward-button { @@ -1355,7 +1387,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o } window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #forward-button { - transition: opacity @forwardTransitionLength@ ease-out; + transition: opacity 150ms ease-out; } window:not([chromehidden~="toolbar"]) #urlbar-container:not(:hover) > #forward-button[disabled=true] { @@ -1472,6 +1504,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud -moz-image-region: rect(1px, 71px, 17px, 55px); } +/* zoom control text (reset) button special case: */ + +#nav-bar #zoom-reset-button > .toolbarbutton-text { + /* To make this line up with the icons, it needs the same height (18px) + + * padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise + * increase in text sizes would break things... + */ + min-height: 20px; +} + /* ::::: fullscreen window controls ::::: */ #window-controls { @@ -1568,7 +1610,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #url } window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper { -/* clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");*/ +/* clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/ } window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar { @@ -4082,10 +4124,12 @@ notification.pluginVulnerable .messageImage { /* Customization mode */ -#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck { - margin: 0 1em 1em; +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox { + margin-bottom: 1em; } +#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck, +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox, #main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox { margin-left: 1em; margin-right: 1em; @@ -4184,8 +4228,12 @@ notification.pluginVulnerable .messageImage { padding: 10px 10px 0px; } +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox, #customization-footer { /*background-color: rgb(236,236,236);*/ +} + +#customization-footer { border-top: 1px solid #9C9CFF; padding: 15px; } @@ -4302,7 +4350,7 @@ toolbarpaletteitem[place="toolbar"] { max-width: 24px; min-width: 24px; max-height: 24px; - height: 24px; + min-height: 24px; padding: 4px; } @@ -4424,12 +4472,17 @@ toolbarpaletteitem[place="toolbar"] { background-attachment: fixed; } -#customization-container { +#main-window[customize-entered] #browser-bottombox, +#main-window[customize-entered] #customization-container { border-left: 1px solid #9C9CFF; border-right: 1px solid #9C9CFF; background-clip: padding-box; } +#main-window[customize-entered] #browser-bottombox { + border-bottom: 1px solid #9C9CFF; +} + #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] { margin-right: -2px; } diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index b352c18a..1346de42 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -145,11 +145,33 @@ 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 { - margin: 2px 0 0; - text-align: center; +/* 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, #wrapper-zoom-controls:-moz-any([place="palette"],[place="panel"]) > #zoom-controls { -moz-margin-start: 0; @@ -209,6 +231,13 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it 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[sdk-button="true"] > .toolbarbutton-icon, toolbarbutton[sdk-button="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon { @@ -288,6 +317,18 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe { 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-fxa-status, +#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* @@ -380,6 +421,10 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { display: flex; border-top: 1px solid #9C9CFF; } ++ +#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner { + position: relative; +} #PanelUI-footer-inner > toolbarseparator { border: 0; @@ -399,8 +444,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { padding: 10px 0; min-height: 2em; box-shadow: none; - background-image: none; - border: none; + border: none; border-radius: 0; transition: background-color; -moz-box-orient: horizontal; @@ -416,6 +460,10 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { 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: 44px; @@ -695,8 +743,17 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],[checked="true"],: } #BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator { - / Hide bottom separator as the styled footer includes a top border serving the same purpose / - display: none; + / Hide bottom separator as the styled footer includes a top border serving the same purpose. + * We can't just use display: none here, otherwise scrollbox.xml will flip out and sometimes + * refuse to scroll for us (see bug 984156). Instead, we set it to visibility hidden, force + * a minimum height, and then negative-margin that single pixel into oblivion. That seems + * to be enough to make scrollbox happy. + / + -moz-appearance: none; + visibility: hidden; + min-height: 1px; + margin: -1px 0 0; + border: none; } */ @@ -745,28 +802,43 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],[checked="true"],: height: 16px; } -#PanelUI-footer > #PanelUI-footer-inner[panel-multiview-anchor=true], -toolbarbutton[panel-multiview-anchor=true] { +toolbarbutton[panel-multiview-anchor="true"], +toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button { + color: #000000; background-color: #008484; } -toolbarbutton[panel-multiview-anchor=true] { +#PanelUI-help[panel-multiview-anchor="true"] + toolbarseparator { + display: none; +} + +#PanelUI-help[panel-multiview-anchor="true"] { + background-image: none; +} + +#PanelUI-help[panel-multiview-anchor="true"]::after { + content: ""; + position: absolute; + top: 0; + height: 100%; + width: 38px; + background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); + background-repeat: no-repeat; + background-color: #008484; + background-position: left 10px center, 0; /* this doesn't need to be changed for RTL */ +} + +toolbarbutton[panel-multiview-anchor="true"] { background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); background-position: right 5px center; background-repeat: no-repeat; } -toolbarbutton[panel-multiview-anchor=true]:-moz-locale-dir(rtl) { +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 5px center; } -#PanelUI-footer > #PanelUI-footer-inner[panel-multiview-anchor=true], -toolbarbutton[panel-multiview-anchor=true], -toolbarbutton[panel-multiview-anchor=true] > .toolbarbutton-menubutton-button { - color: #000000; -} - toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker, #bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menubutton-dropmarker { display: none; @@ -793,6 +865,16 @@ toolbarpaletteitem[place="palette"] > #search-container { transition-duration: 150ms; } +/* Make direct siblings overlap borders: */ +.toolbaritem-combined-buttons + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) { +/* border-top-color: transparent !important; */ +} + +.toolbaritem-combined-buttons + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]), +toolbarpaletteitem[haswideitem][place="panel"] + toolbarpaletteitem[haswideitem][place="panel"] { +/* margin-top: -1px; */ +} + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { border: 0; padding: .5em; diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 95d31460..f6e91995 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -363,11 +363,11 @@ background-position: center left; } -.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) { +.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) { background-image: url("itemArrow-ltr.svg"); } -.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) { +.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) { background-image: url("itemArrow-rtl.svg"); } @@ -730,11 +730,11 @@ transform: translateZ(1px); } -.theme-dark .generic-chart-container { +.generic-chart-container { color: #A09090; /* Light foreground text */ } -.theme-dark .chart-colored-blob { +.chart-colored-blob { fill: #9C9CFF; /* Light content text */ background: #9C9CFF; } @@ -746,11 +746,11 @@ cursor: pointer; } -.theme-dark .pie-chart-slice { +.pie-chart-slice { stroke: #A09090; } -.theme-dark .pie-chart-slice[largest] { +.pie-chart-slice[largest] { stroke-width: 2px; stroke: #9C9CFF; } @@ -761,7 +761,7 @@ pointer-events: none; } -.theme-dark .pie-chart-label { +.pie-chart-label { fill: #000; } diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index 8597bd7c..8b61d5e2 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -53,7 +53,6 @@ border: none; list-style-image: url("chrome://global/skin/icons/close.png"); -moz-image-region: rect(0, 16px, 16px, 0); - -moz-user-focus: normal; } #newtab-undo-close-button:hover { diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css index acd50262..2b2afc14 100644 --- a/LCARStrek/browser/preferences/preferences.css +++ b/LCARStrek/browser/preferences/preferences.css @@ -182,3 +182,11 @@ label.small { #noFxaAccount > label:first-child { margin-bottom: 0.6em; } + +#fxa-pweng-help-link > label { + margin: 0; +} + +#fxa-pweng-help-link > image { + list-style-image: url("chrome://global/skin/icons/question-16.png"); +} diff --git a/LCARStrek/browser/syncProgress-horizontalbar-single.png b/LCARStrek/browser/syncProgress-horizontalbar-single.png new file mode 100644 index 00000000..396723c9 Binary files /dev/null and b/LCARStrek/browser/syncProgress-horizontalbar-single.png differ diff --git a/LCARStrek/browser/syncProgress-horizontalbar.png b/LCARStrek/browser/syncProgress-horizontalbar.png index 396723c9..79d97238 100644 Binary files a/LCARStrek/browser/syncProgress-horizontalbar.png and b/LCARStrek/browser/syncProgress-horizontalbar.png differ diff --git a/LCARStrek/browser/syncProgress-menuPanel.png b/LCARStrek/browser/syncProgress-menuPanel.png new file mode 100644 index 00000000..6fd6f9c1 Binary files /dev/null and b/LCARStrek/browser/syncProgress-menuPanel.png differ diff --git a/LCARStrek/browser/syncProgress-toolbar.png b/LCARStrek/browser/syncProgress-toolbar.png new file mode 100644 index 00000000..05078a9c Binary files /dev/null and b/LCARStrek/browser/syncProgress-toolbar.png differ