From 8c6555e28fa244bc0231d8176d587cdd086983a8 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 29 Mar 2015 18:48:46 +0200 Subject: [PATCH] sixth and final part of syncing LCARStrek with Firefox 36 windows theme changes --- LCARStrek/browser/devtools/dark-theme.css | 3 ++- LCARStrek/browser/devtools/font-inspector.css | 3 +-- LCARStrek/browser/devtools/profiler.css | 22 ++++++++++----- LCARStrek/browser/devtools/webconsole.css | 2 +- .../browser/search-indicator-badge-add.png | Bin 0 -> 281 bytes LCARStrek/browser/searchbar.css | 25 +++++++++++++----- 6 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 LCARStrek/browser/search-indicator-badge-add.png diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 0d347336..98b3d7a4 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -21,6 +21,7 @@ --theme-selection-color: #000000; --theme-selection-background2: #004242; --theme-selection-color2: #FF9F00; + --theme-selection-background-semitransparent: rgba(0, 132, 132, .5); --theme-splitter-color: #9C9CFF; --theme-comment: #A09090; @@ -63,7 +64,7 @@ } .theme-bg-darker { - background-color: rgba(0,0,0,0.5); + background: var(--theme-selection-background-semitransparent); } .theme-selected, diff --git a/LCARStrek/browser/devtools/font-inspector.css b/LCARStrek/browser/devtools/font-inspector.css index bba253e5..70a0b0e7 100644 --- a/LCARStrek/browser/devtools/font-inspector.css +++ b/LCARStrek/browser/devtools/font-inspector.css @@ -51,9 +51,8 @@ body { } .font-preview { + margin-left: -4px; height: 60px; - width: 100%; - border: 0; display: block; } diff --git a/LCARStrek/browser/devtools/profiler.css b/LCARStrek/browser/devtools/profiler.css index 85b363b7..bb0e0a11 100644 --- a/LCARStrek/browser/devtools/profiler.css +++ b/LCARStrek/browser/devtools/profiler.css @@ -4,6 +4,15 @@ /* === file identical to profiler.inc.css === */ +/* CSS Variables specific to this panel that aren't defined by the themes */ +.theme-dark, +.theme-light { + --cell-border-color: #9C9CFF; + --focus-cell-border-color: #9C9CFF; + --row-alt-background-color: #402800; + --row-hover-background-color: #795900; +} + window { padding: 0; } @@ -222,12 +231,13 @@ window { .call-tree-header:not(:last-child), .call-tree-cell:not(:last-child) { - -moz-border-end: 1px solid; + -moz-border-end-width: 1px; + -moz-border-end-style: solid; } .call-tree-header, .call-tree-cell { - -moz-border-end-color: #9C9CFF; + -moz-border-end-color: var(--cell-border-color); } .call-tree-header:not(:last-child) { @@ -244,15 +254,15 @@ window { } .call-tree-item:last-child:not(:focus) { - border-bottom: #9C9CFF; + border-bottom: 1px solid var(--cell-border-color); } .call-tree-item:nth-child(2n) { - background-color: #392900; + background-color: var(--row-alt-background-color); } .call-tree-item:hover { - background-color: #392900; + background-color: var(--row-hover-background-color); } .call-tree-item:focus { @@ -265,7 +275,7 @@ window { } .call-tree-item:focus .call-tree-cell { - -moz-border-end-color: #9C9CFF; + -moz-border-end-color: var(--focus-cell-border-color); } .call-tree-item:not([origin="content"]) .call-tree-name, diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index b10d94cd..e72ef972 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -230,7 +230,7 @@ a { } .message:hover { - background-color: #404000; + background-color: var(--theme-contrast-background); } .message[severity=error] { diff --git a/LCARStrek/browser/search-indicator-badge-add.png b/LCARStrek/browser/search-indicator-badge-add.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ece2d3207c1cd47d5869913dae731bbe484cf GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<#0(^xG^T?%JOMr-uJ=540GSLeEej@0;9ois zB+Xb7lTe z%KC>5B^rQ2ZJsWUAsp9}6C4<$3Ys#nGHE2%XWV3B3shG)_~-xiO`<&u15bw;7|3tn zI-5{30Z2SZe-O2;Nz{d5X3c4_4MrOnuQJVC?QkYkL2bVnvo^E#g_vi|W;{GSd`b@7 zGyeZ)H*$7%oOW}*{ec4tuU;`E8P_ui^)Mzp|HCM#n6QkuLm*Lsm4V^@FNNoE3pREG PUBuw&>gTe~DWM4fIS^G} literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index efb6a425..30fc3538 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -2,6 +2,10 @@ * 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/. */ +#PopupSearchAutoComplete { + -moz-margin-start: -25px; +} + .searchbar-dropmarker-image { --searchbar-dropmarker-url: url("chrome://global/skin/arrow/arrow-down.gif"); --searchbar-dropmarker-hover-url: url("chrome://global/skin/arrow/arrow-down-hover.gif"); @@ -21,7 +25,6 @@ height: 16px; width: 16px; list-style-image: url("chrome://global/skin/filepicker/file.gif"); - -moz-margin-start: 2px; } .searchbar-engine-button { @@ -88,20 +91,23 @@ font-weight: bold; } - .searchbar-search-button-container { -moz-box-align: center; - padding: 3px 4px; - -moz-padding-end: 2px; } .searchbar-search-button { list-style-image: url("chrome://browser/skin/search-indicator.png"); -moz-image-region: rect(0, 20px, 20px, 0); - margin: -2px -2px; + margin-top: 1px; + margin-bottom: 1px; + -moz-margin-start: 4px; border-radius: 3px; } +.searchbar-search-button[addengines="true"] { + list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png"); +} + .searchbar-search-button:hover, .searchbar-search-button:hover:active { -moz-image-region: rect(0, 40px, 20px, 20px); @@ -219,11 +225,18 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon color: #000000; } -.addengine-item > .button-box > .button-icon { +.addengine-icon { height: 16px; width: 16px; } +.addengine-badge { + width: 16px; + height: 16px; + margin: -7px -9px 7px 9px; + list-style-image: url("chrome://browser/skin/badge-add-engine.png"); +} + .addengine-item > .button-box > .button-text { -moz-box-flex: 1; text-align: start; -- 2.35.3