From 368d0b7ff30fae6bb74e895e6fb8d1a182a1cb1c Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 1 May 2015 22:37:32 +0200 Subject: [PATCH] first part of syncing LCARStrek with Firefox 38 windows theme changes --- LCARStrek/browser/browser.css | 5 ++ LCARStrek/browser/devtools/dark-theme.css | 45 +++++++---- LCARStrek/browser/devtools/filters.svg | 11 +++ LCARStrek/browser/devtools/power.svg | 33 ++++++++ LCARStrek/browser/devtools/webaudioeditor.css | 75 ++++++++++++++++++- .../preferences/in-content/preferences.css | 4 + 6 files changed, 156 insertions(+), 17 deletions(-) create mode 100644 LCARStrek/browser/devtools/power.svg diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 0562f9ad..737c4bbd 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2655,6 +2655,11 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { /* === BEGIN tabs.inc.css === */ +:root { + /* --tab-toolbar-navbar-overlap: 1px; */ + /* --tab-min-height: 31px; */ +} + .tabbrowser-tab, .tabs-newtab-button, #TabsToolbar > #new-tab-button { diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index dcd62750..acb0cb52 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -206,7 +206,8 @@ .theme-toolbar, .devtools-toolbar, -.devtools-sidebar-tabs > tabs, +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs, .CodeMirror-dialog { /* General toolbar styling */ /* color: var(--theme-body-color-alt); background-color: var(--theme-toolbar-background);*/ @@ -424,7 +425,8 @@ div.CodeMirror span.eval-text { /* Toolbars */ .devtools-toolbar, -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs { } .devtools-toolbar { @@ -708,17 +710,28 @@ div.CodeMirror span.eval-text { border: 0; } -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs { position: static; overflow: hidden; } -.devtools-sidebar-tabs > tabs > .tabs-right, -.devtools-sidebar-tabs > tabs > .tabs-left { +.devtools-sidebar-alltabs { +/* margin: 0; + border-width: 0 0 1px 0; + -moz-border-start-width: 1px; + border-style: solid;*/ +} + +.devtools-sidebar-alltabs dropmarker { + display: none; +} + +.devtools-sidebar-tabs tabs > .tabs-right, +.devtools-sidebar-tabs tabs > .tabs-left { display: none; } -.devtools-sidebar-tabs > tabs > tab { +.devtools-sidebar-tabs tabs > tab { min-width: 78px; text-align: center; -moz-box-flex: 1; @@ -726,34 +739,34 @@ div.CodeMirror span.eval-text { margin-top: 0; } -.devtools-sidebar-tabs > tabs > tab:-moz-focusring { +.devtools-sidebar-tabs tabs > tab:-moz-focusring { position: static; } -.devtools-sidebar-tabs > tabs > tab:last-of-type { +.devtools-sidebar-tabs tabs > tab:last-of-type { -moz-border-end-width: 0; } -.devtools-sidebar-tabs > tabs > tab:first-child { +.devtools-sidebar-tabs tabs > tab:first-child { } -.devtools-sidebar-tabs > tabs > tab:hover { +.devtools-sidebar-tabs tabs > tab:hover { } -.devtools-sidebar-tabs > tabs > tab:hover:active { +.devtools-sidebar-tabs tabs > tab:hover:active { } -.devtools-sidebar-tabs > tabs > tab[selected] + tab { +.devtools-sidebar-tabs tabs > tab[selected] + tab { } -.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { +.devtools-sidebar-tabs tabs > tab[selected] + tab:hover { } -.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active { +.devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active { } -.devtools-sidebar-tabs > tabs > tab[selected], -.devtools-sidebar-tabs > tabs > tab[selected]:hover:active { +.devtools-sidebar-tabs tabs > tab[selected], +.devtools-sidebar-tabs tabs > tab[selected]:hover:active { } /* Toolbox - moved from toolbox.css. diff --git a/LCARStrek/browser/devtools/filters.svg b/LCARStrek/browser/devtools/filters.svg index 69c6bc3e..ccd72cf2 100644 --- a/LCARStrek/browser/devtools/filters.svg +++ b/LCARStrek/browser/devtools/filters.svg @@ -13,4 +13,15 @@ + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/power.svg b/LCARStrek/browser/devtools/power.svg new file mode 100644 index 00000000..9757909c --- /dev/null +++ b/LCARStrek/browser/devtools/power.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/webaudioeditor.css b/LCARStrek/browser/devtools/webaudioeditor.css index d4710420..9acb10d9 100644 --- a/LCARStrek/browser/devtools/webaudioeditor.css +++ b/LCARStrek/browser/devtools/webaudioeditor.css @@ -59,7 +59,7 @@ g.edgeLabel rect { fill: var(--theme-body-background); } g.edgeLabel tspan { - fill: var(--theme-Highlight-color-blue); + fill: var(--theme-highlight-color-blue); } /* Audio Nodes */ @@ -73,10 +73,35 @@ g.edgeLabel tspan { fill: var(--theme-toolbar-background); } +/** + * Bypassed Nodes + */ + +.theme-light .nodes g.bypassed rect { + fill: url(chrome://browser/skin/devtools/filters.svg#bypass-light); +} +.theme-dark .nodes g.bypassed rect { + fill: url(chrome://browser/skin/devtools/filters.svg#bypass-dark); +} +.nodes g.bypassed.selected rect { + stroke: var(--theme-selection-background); +} + +/* +.nodes g.bypassed text { + opacity: 0.8; +} +*/ + +/** + * Selected Nodes + */ + .nodes g.selected rect { fill: var(--theme-selection-background); } + /* Text in nodes and edges */ text { cursor: default; /* override the "text" cursor */ @@ -100,6 +125,12 @@ g.selected text { * Inspector Styles */ +/* hide the variables view scope title as its redundant, + * because there's only one scope displayed. */ +.variables-view-scope > .title { + display: none; +} + #web-audio-inspector-title { margin: 6px; } @@ -133,6 +164,20 @@ g.selected text { -moz-image-region: rect(0px,32px,16px,16px); } +/** + * Automation Styles + */ + +#automation-param-toolbar .automation-param-button[selected] { + color: var(--theme-selection-color); + background-color: var(--theme-selection-background); +} + +#automation-graph { + overflow: hidden; + -moz-box-flex: 1; +} + @media (min-resolution: 2dppx) { #inspector-pane-toggle { list-style-image: url("debugger-collapse@2x.png"); @@ -152,6 +197,34 @@ g.selected text { } } +/** + * Inspector toolbar + */ + +#audio-node-toolbar .bypass { + list-style-image: url(power.svg#power); +} + +#audio-node-toolbar .bypass[disabled] { + list-style-image: url(power.svg#power-disabled); +} + +#audio-node-toolbar .bypass:not([disabled]):hover, +#audio-node-toolbar .bypass:hover:active, +#audio-node-toolbar .bypass[checked] { + list-style-image: url(power.svg#power-active); +} + +#audio-node-toolbar toolbarbutton[checked] { + background-color: var(--theme-selection-background); /* Select Highlight Blue */ +} + +/* don't invert checked buttons so we can have white icons on light theme */ +#audio-node-toolbar toolbarbutton[checked] > .toolbarbutton-icon { + filter: none; +} + + /** * Responsive Styles * `.devtools-responsive-container` takes care of most of diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 6175092e..948d9a7b 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -213,6 +213,10 @@ treecol { -moz-margin-start: 0; } +#handlersView { + height: 25em; +} + #handlersView > richlistitem { min-height: 36px !important; } -- 2.35.3