From 6dc70335b2a0bf287f39b81011cb275c8158622c Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 23 Feb 2014 23:51:05 +0100 Subject: [PATCH] second part of synching LCARStrek with windows theme changes in Firefox 28 cycle --- LCARStrek/browser/browser.css | 72 +++++++++---------- .../browser/devtools/app-manager/projects.css | 1 + LCARStrek/browser/devtools/common.css | 1 + LCARStrek/browser/devtools/dark-theme.css | 58 +++++++++++++++ LCARStrek/browser/devtools/debugger.css | 4 -- LCARStrek/browser/devtools/toolbox.css | 4 -- LCARStrek/browser/devtools/webconsole.css | 6 +- 7 files changed, 96 insertions(+), 50 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 2dd544b7..6e02f342 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -89,16 +89,16 @@ menubar { #navigator-toolbox > toolbar:not(:-moz-lwtheme) { } -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) { /* like menubar */ background-color: #6000CF; color: #FF9F00; } -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { background-color: #8050B0; color: #FF9F00; } -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab { +#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab { padding-top: 3px; } @@ -114,6 +114,9 @@ menubar { #nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar, #nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar { /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */ + /* Position the toolbar above the bottom of background tabs */ + position: relative; + z-index: 1; } #personal-bookmarks { @@ -126,6 +129,16 @@ menubar { /* ::::: app menu button ::::: */ +/* The app menu button must appear on top of the navigator-toolbox in order + * for click and hover mouse events to work properly for the button in the + * restored window state. Otherwise, elements in the navigator-toolbox, like the + * menubar can swallow these events. It will also place the button above the + * fog on themes with Aero Glass. + */ +#main-window[tabsintitlebar] #appmenu-button-container { + z-index: 1; +} + #appmenu-button { background-color: #FF9F00; background-clip: padding-box; @@ -2705,6 +2718,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { border-bottom: 1px solid #008484; } +/* === BEGIN tabs.inc.css === */ + .tabbrowser-tab, .tabs-newtab-button, #TabsToolbar > #new-tab-button { @@ -2734,45 +2749,34 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { text-decoration: underline; } -.tabbrowser-tab:hover, -.tabs-newtab-button:hover { -} +/* Selected tab */ .tabbrowser-tab[selected="true"] { } -#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { -} +/* End selected tab */ -.tabbrowser-tab:-moz-lwtheme { -} +/* Pinned tabs */ -.tabbrowser-tab[selected="true"]:-moz-lwtheme { +.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { + background-color: #E7ADE7; } - -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-brighttext { +.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { + background-color: #3333FF; + color: #000000; } -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-brighttext:hover { -} +/* New tab button */ -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-darktext { +.tabs-newtab-button { + width: 28px; } -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-darktext:hover { +#TabsToolbar > #new-tab-button { + width: 26px; } -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { - background-color: #E7ADE7; -} -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { - background-color: #3333FF; - color: #000000; -} +/* === END tabs.inc.css === */ .tab-throbber, .tab-icon-image { @@ -2851,14 +2855,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { -moz-image-region: rect(0, 16px, 18px, 0); } -.tabs-newtab-button { - width: 28px; -} - -#TabsToolbar > #new-tab-button { - width: 26px; -} - /* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ .tabs-newtab-button, .tabs-newtab-button:hover, @@ -4299,8 +4295,6 @@ notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -/* Customization mode */ - /* === END plugin-doorhanger.inc.css === */ #main-window[privatebrowsingmode=temporary] #toolbar-menubar { @@ -4482,8 +4476,6 @@ toolbarpaletteitem[place="toolbar"] { background-clip: padding-box; } -/* End customization mode */ - #main-window[privatebrowsingmode=temporary] #TabsToolbar::after { content: ""; display: -moz-box; diff --git a/LCARStrek/browser/devtools/app-manager/projects.css b/LCARStrek/browser/devtools/app-manager/projects.css index 3aaf6678..6d1868b4 100644 --- a/LCARStrek/browser/devtools/app-manager/projects.css +++ b/LCARStrek/browser/devtools/app-manager/projects.css @@ -442,6 +442,7 @@ strong { margin: 20px 20px 0; padding: 10px 10px; font-family: monospace; + color: #000000; } .project-warnings { diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index f112026a..b0e19b87 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -270,6 +270,7 @@ devtools-menulist:-moz-focusring, border: 1px solid #FF9F00; background-color: #000000; border-radius: 3px; + overflow-x: hidden; max-height: 40rem; } diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 828c0483..55f99d80 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -133,6 +133,11 @@ color: #FF0000; } +.theme-toolbar, +.devtools-toolbar { /* General toolbar styling */ +} + + .theme-fg-contrast { /* To be used for text on theme-bg-contrast */ color: #FFCF00; } @@ -198,4 +203,57 @@ div.cm-s-mozilla span.CodeMirror-matchingbracket { /* highlight brackets */ min-height: 1.4em; } +/* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */ + +.theme-tooltip-panel .panel-arrowcontent { +/* padding: 5px; */ + background: rgba(0, 0, 0, .9); +/* border-radius: 5px; + box-shadow: none; + border: 3px solid #9C9CFF; */ +} + +/* Overring panel arrow images to fit with our light and dark themes */ +/* +.theme-tooltip-panel .panel-arrow[side="top"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark.png"); + margin-bottom: -4px; +} + +.theme-tooltip-panel .panel-arrow[side="bottom"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark.png"); + margin-top: -4px; +} + +.theme-tooltip-panel .panel-arrow[side="left"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark.png"); + margin-right: -4px; +} + +.theme-tooltip-panel .panel-arrow[side="right"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark.png"); + margin-left: -4px; +} + +@media (min-resolution: 2dppx) { + .theme-tooltip-panel .panel-arrow[side="top"], + .theme-tooltip-panel .panel-arrow[side="bottom"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark@2x.png"); + } + + .theme-tooltip-panel .panel-arrow[side="left"], + .theme-tooltip-panel .panel-arrow[side="right"] { + list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark@2x.png"); + } +} +*/ +.theme-tooltip-panel .devtools-tooltip-simple-text { +/* color: white; */ + border-bottom: 1px solid #A09090; +} + +.theme-tooltip-panel .devtools-tooltip-simple-text:last-child { + border-bottom: 0; +} + /* remove import on top of file when toolbars.inc.css work is done */ diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index b44969bb..b0be73be 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -6,10 +6,6 @@ window { padding: 0; } -#body { - background-color: #000000; -} - /* Sources and breakpoints pane */ #sources-pane { diff --git a/LCARStrek/browser/devtools/toolbox.css b/LCARStrek/browser/devtools/toolbox.css index 7432a016..dc9b191b 100644 --- a/LCARStrek/browser/devtools/toolbox.css +++ b/LCARStrek/browser/devtools/toolbox.css @@ -224,10 +224,6 @@ notification { visibility: collapse; } -#options-panel { - /* background-image: url("chrome://browser/skin/newtab/noise.png"); */ -} - .options-vertical-pane { margin: 5px; width: calc(50% - 30px); diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index 4de0915d..bc546f9c 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -113,8 +113,6 @@ a { } #output-wrapper { - background: #000000; - color: #FF9F00; direction: ltr; border-bottom: 1px solid #9C9CFF; overflow: auto; @@ -128,6 +126,10 @@ a { align-items: flex-start; } +#output-container.hideTimestamps > .message > .timestamp { + display: none; +} + .filtered-by-type, .filtered-by-string { display: none; -- 2.43.0