From cae267abf310c32cfc8f74e260d2d4798e7634a1 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 4 Jul 2014 16:38:20 +0200 Subject: [PATCH] fourth part of syncing LCARStrek with Firefox 30 windows theme changes --- LCARStrek/browser/browser.css | 45 +++++++++++++++++-- .../browser/customizableui/panelUIOverlay.css | 35 +++++++++------ .../browser/devtools/app-manager/device.css | 18 +++++--- LCARStrek/browser/devtools/layoutview.css | 29 ++++++------ 4 files changed, 89 insertions(+), 38 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index b40dde75..f238d7ba 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -7,6 +7,7 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @namespace html url("http://www.w3.org/1999/xhtml"); +@namespace svg url("http://www.w3.org/2000/svg"); toolbar { -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar"); @@ -2933,6 +2934,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } /* Notification icon box */ +#notification-popup .panel-promo-box { +/* margin: 10px -10px -10px; */ +} + #notification-popup-box { position: relative; background-color: #000000; @@ -3163,6 +3168,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper[forwarddisabled] > #urlbar /* Sync Panel */ .sync-panel-icon { + height:32px; width: 32px; background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; } @@ -3178,7 +3184,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper[forwarddisabled] > #urlbar #sync-error-panel-title, #sync-start-panel-title { + font-size: 120%; font-weight: bold; + margin-bottom: 5px; } #sync-start-panel-subtitle, @@ -3220,11 +3228,40 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper[forwarddisabled] > #urlbar /* === BEGIN highlighter.inc.css === */ -/* Highlighter */ +/* Box model highlighter */ +svg|g.box-model-container { + opacity: 0.4; +} + +svg|polygon.box-model-content { + fill: #008484; +} + +svg|polygon.box-model-padding { + fill: #9C9CFF; +} + +svg|polygon.box-model-border { + fill: #FFCF00; +} + +svg|polygon.box-model-margin { + fill: #A09090; +} + +svg|polygon.box-model-content, +svg|polygon.box-model-padding, +svg|polygon.box-model-border, +svg|polygon.box-model-margin { + stroke: none; +} -.highlighter-outline { - box-shadow: 0 0 0 1px black; - outline: 1px dashed #A09090; +svg|line.box-model-guide-top, +svg|line.box-model-guide-right, +svg|line.box-model-guide-bottom, +svg|line.box-model-guide-left { + stroke: #E7ADE7; + stroke-dasharray: 5 3; } /* Highlighter - Node Infobar */ diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 8c8e14fd..5345e8a7 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -5,7 +5,7 @@ /* === BEGIN panelUIOverlay.inc.css === */ #PanelUI-popup #PanelUI-contents:empty { - height: 128px; + height: 128px; } #PanelUI-popup #PanelUI-contents:empty::before { @@ -83,7 +83,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan #PanelUI-popup .panel-subview-body { margin: -4px; - padding: 2px 4px; + padding: 4px 4px; } .panel-subview-header, @@ -596,13 +596,11 @@ panelview .toolbarbutton-1, .widget-overflow-list .toolbarbutton-1, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { -/* padding: 2px 6px; +/* padding: 0 6px; background-color: hsla(210,4%,10%,0); border-radius: 2px; border-style: solid; border-color: hsla(210,4%,10%,0);*/ - transition-property: background-color, border-color; - transition-duration: 150ms; } panelview .toolbarbutton-1, @@ -646,7 +644,7 @@ panelview .toolbarbutton-1, /* 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-size: 1.1em;*/ +/* font: menu;*/ } .PanelUI-subView .subviewbutton[shortcut]::after { @@ -725,7 +723,7 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), } #BMB_bookmarksPopup .subviewbutton { - font: inherit; + font: menu; font-weight: normal; } @@ -745,10 +743,6 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), padding-bottom: 0px; } -#BMB_bookmarksPopup menupopup { - padding-top: 2px; -} - #BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator { / 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 @@ -762,6 +756,20 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), margin: -1px 0 0; border: none; } + +/ Popups with only one item don't have a footer / +menupopup[placespopup=true][singleitempopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox, +/ These popups never have a footer / +#BMB_bookmarksToolbarPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox, +#BMB_unsortedBookmarksPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox { + / And so they need some bottom padding: / + padding-bottom: 4px; +} + +/ Disabled (empty) item is always alone and never has an icon, so fix its left padding / +#BMB_bookmarksPopup menupopup[emptyplacesresult] .bookmark-item.subviewbutton { + padding-left: 6px; +} */ .PanelUI-subView menuseparator, @@ -1013,12 +1021,11 @@ toolbarbutton[overflowedItem=true] { background-image: url("chrome://global/skin/menu/menu-check-hover.gif"); } -.PanelUI-subView .menu-iconic-left { - -moz-appearance: none; +.subbiewbutton > .menu-iconic-left { -moz-margin-end: 3px; } -.PanelUI-subView menuitem[checked="true"] > .menu-iconic-left { +menuitem[checked="true"].subviewbutton > .menu-iconic-left { visibility: hidden; } diff --git a/LCARStrek/browser/devtools/app-manager/device.css b/LCARStrek/browser/devtools/app-manager/device.css index ad17d15d..bb2c2fd3 100644 --- a/LCARStrek/browser/devtools/app-manager/device.css +++ b/LCARStrek/browser/devtools/app-manager/device.css @@ -308,35 +308,35 @@ header { -/***************** APPS *****************/ +/***************** APPS & BROWSER TABS *****************/ -.apps { +.apps, .browser-tabs { display: flex; flex-direction: column; overflow: auto; } -.app { +.app, .browser-tab { display: flex; align-items: center; order: 1; } -.app-name { +.app-name, .browser-tab-details { flex-grow: 1; font-weight: bold; } -.app { +.app, .browser-tab { padding: 10px 20px; border-bottom: 1px solid #9C9CFF; } -.app:hover { - background-color: #404000 +.app:hover, .browser-tab:hover { + background-color: #404000; } .app-icon { @@ -345,6 +345,10 @@ header { margin-right: 10px; } +.browser-tab-url-subheading { + font-size: 10px; +} + /***************** NOT CONNECTED *****************/ diff --git a/LCARStrek/browser/devtools/layoutview.css b/LCARStrek/browser/devtools/layoutview.css index e1a91b29..2932cf46 100644 --- a/LCARStrek/browser/devtools/layoutview.css +++ b/LCARStrek/browser/devtools/layoutview.css @@ -2,38 +2,41 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -.theme-body { +.theme-sidebar { background: url("layout-background-grid.png"), radial-gradient(50% 70%, circle cover, #000000 0%, #000000 100%); } -.theme-body { - color: #FF9F00 !important; +.theme-sidebar { + color: #FF9F00; box-sizing: border-box; } #main { + background-color: #FF9F00; border-color: #A09090; border-style: dotted; -} - -#main > .margin, -#main > .padding { color: #000000; } -#main > .border { +#content { + background-color: #008484; } -.border > span { -} - -#content { +#padding, +#margins { } #padding { + background-color: #9C9CFF; border-color: #9C9CFF; - border-style: solid; } #borders { + background-color: #FFCF00; + border-color: #FFCF00; +} + +#margins { + background-color: #A09090; + border-color: #A09090; } -- 2.43.0