From 649b5d38865cb338a3419ffda9ff41382c2c9523 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 30 Jun 2014 03:22:45 +0200 Subject: [PATCH] third part of syncing LCARStrek with Firefox 30 windows theme changes --- .../browser/customizableui/panelUIOverlay.css | 48 +++++------ LCARStrek/browser/devtools/common.css | 8 ++ LCARStrek/browser/devtools/controls@2x.png | Bin 0 -> 285 bytes LCARStrek/browser/devtools/dark-theme.css | 81 ++++++++++-------- LCARStrek/browser/devtools/netmonitor.css | 22 +---- LCARStrek/browser/devtools/webconsole.css | 27 ++++++ LCARStrek/browser/downloads/downloads.css | 13 +++ 7 files changed, 120 insertions(+), 79 deletions(-) create mode 100644 LCARStrek/browser/devtools/controls@2x.png diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 4366f625..8c8e14fd 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -75,10 +75,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan -moz-box-flex: 1; } -.subviewbutton:not(:-moz-any([image],[targetURI],.cui-withicon)) > .toolbarbutton-text { - -moz-margin-start: 0; -} - .panel-subview-body { overflow-y: auto; overflow-x: hidden; @@ -310,7 +306,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="menu-panel"] > .toolbarbutton-ico border-radius: 0 0 2px 0; } -.panel-combined-button[disabled] > .toolbarbutton-icon { +#main-window:not([customizing]) .panel-combined-button[disabled] > .toolbarbutton-icon { /* opacity: .5; */ } @@ -680,28 +676,28 @@ panelview .toolbarbutton-1, } /* -panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, -toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, -menu.subviewbutton:not(:-moz-any([disabled],[checked="true"],:active))[_moz-menuactive], -menuitem.subviewbutton:not(:-moz-any([disabled],[checked="true"],:active))[_moz-menuactive], -.widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],[checked="true"],:active)):hover, +panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, +toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, +menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], +menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], +.widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[checked="true"],[open],:active)):hover { background-color: hsla(210,4%,10%,.08); border-color: hsla(210,4%,10%,.11); } -.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]):not(:-moz-any([disabled],[open],[checked="true"],:active)):hover { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]):not(:-moz-any([disabled],[open],:active)):hover { border-color: hsla(210,4%,10%,.11); } -panelview .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active), -toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active), -menu.subviewbutton:not([disabled]):-moz-any([checked="true"],[_moz-menuactive]:active), -menuitem.subviewbutton:not([disabled]):-moz-any([checked="true"],[_moz-menuactive]:active), -.widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],[checked="true"],:hover:active), +panelview .toolbarbutton-1:not([disabled]):-moz-any([open],:hover:active), +toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],:hover:active), +menu.subviewbutton:not([disabled])[_moz-menuactive]:active, +menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active, +.widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],:hover:active), .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) - > toolbarbutton:not([disabled]):-moz-any([open],[checked="true"],:hover:active) { + > toolbarbutton:not([disabled]):-moz-any([open],:hover:active) { background-color: hsla(210,4%,10%,.12); border-color: hsla(210,4%,10%,.14); box-shadow: 0 1px 0 hsla(210,4%,10%,.03) inset; @@ -721,8 +717,8 @@ menuitem.panel-subview-footer:not(:-moz-any([disabled],[open],:active)):hover, border-top: 1px solid hsla(210,4%,10%,.12); } -menuitem.panel-subview-footer:not([disabled]):-moz-any([open],[checked="true"],:hover:active), -.subviewbutton.panel-subview-footer:not([disabled]):-moz-any([open],[checked="true"],:hover:active) { +menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), +.subviewbutton.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active) { background-color: hsla(210,4%,10%,.15); border-top: 1px solid hsla(210,4%,10%,.12); box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; @@ -1133,14 +1129,14 @@ toolbarbutton.social-provider-menuitem > .toolbarbutton-icon { .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item)[checked="true"] > .toolbarbutton-icon { visibility: hidden; } -/* + menu.subviewbutton > .menu-right { - -moz-appearance: none; - list-style-image: url("chrome://browser/skin/places/bookmarks-menu-arrow.png"); - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url("chrome://global/skin/menu/menu-arrow.gif"); +} +menu.subviewbutton:hover > .menu-right, +menu.subviewbutton[_moz-menuactive="true"] > .menu-right { + list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif"); } - menu[disabled="true"].subviewbutton > .menu-right { - -moz-image-region: rect(0, 32px, 16px, 16px); + list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif"); } -*/ \ No newline at end of file diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index 72b7e702..126b2cb1 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -208,6 +208,14 @@ notification { margin-bottom: -4px; } +/* Tooltip: Font Family Previewer Text */ +.devtools-tooltip-font-previewer-text { + max-width: 400px; + line-height: 1.5; + font-size: 150%; + text-align: center; +} + /* Tooltip: Alert Icon */ .devtools-tooltip-alert-icon { diff --git a/LCARStrek/browser/devtools/controls@2x.png b/LCARStrek/browser/devtools/controls@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d2eae838a043efb0a1f5a6b1231c37b044317056 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^79h;X3?wIctc(RxYymzYt|v6=|DR{bIL%iI6k#k0 z@(X5gcy=QV#7XjYcVXyYmGuB}I14-?i-Bfc2Vq7hjoB4ILG}_)Usv{fY;p|30?X}! zS%E?mJY5_^BrZ=qw~_adfdK1;?wB2ppE%+gCov_mIV&+6T$z5!$i>ZLCR1U-FMAO^ zrH9Wvul=o0zqa?8-Ol}Wa%a^xAKrI(vf9kl$_uM@a@*d0QMojCVd*kflYW!8Z{ENE z`@2`DXj*s7)3CqO_DQl{U!UM<(eR&h&gq184Ys0hav#jI-eJB;kYD+ojn?T$FV_EO Yh^&ZYJ=GSz7w9$yPgg&ebxsLQ03p$6ga7~l literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 85da2fc7..1598355f 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -21,44 +21,13 @@ color: #FFCF00; } -.theme-twisty { - cursor: pointer; - width: 14px; - height: 14px; - background-repeat: no-repeat; - background-image: url("chrome://browser/skin/devtools/controls.png"); - background-position: 0 -14px; -} - -.theme-twisty:-moz-focusring { - outline-style: none; -} - -.theme-twisty[open] { - background-position: -14px -14px; -} - -.theme-checkbox { - display: inline-block; - border: 0; - width: 14px; - height: 14px; - padding: 0; - outline: none; - background-image: url("chrome://browser/skin/devtools/controls.png"); - background-position: 0 0; -} - -.theme-checkbox[checked] { - background-position: -14px 0; +.theme-bg-darker { + background-color: rgba(0,0,0,0.5); } .theme-selected { background: #004242; -} - -.theme-bg-darker { - background-color: rgba(0,0,0,0.5); + color: #FF9F00; /* Light foreground text */ } .theme-bg-contrast, @@ -257,6 +226,46 @@ div.CodeMirror span.eval-text { min-height: 1.4em; } +/* Twisty and checkbox controls */ +.theme-twisty, .theme-checkbox { + width: 14px; + height: 14px; + background-repeat: no-repeat; + background-image: url("chrome://browser/skin/devtools/controls.png"); + background-size: 28px 28px; +} + +.theme-twisty { + cursor: pointer; + background-position: -0px -14px; +} + +.theme-twisty:-moz-focusring { + outline-style: none; +} + +.theme-twisty[open] { + background-position: -14px -14px; +} + +.theme-checkbox { + display: inline-block; + border: 0; + padding: 0; + outline: none; + background-position: 0 0; +} + +.theme-checkbox[checked] { + background-position: -14px 0; +} + +@media (min-resolution: 2dppx) { + .theme-twisty, .theme-checkbox { + background-image: url("chrome://browser/skin/devtools/controls@2x.png"); + } +} + /* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */ .theme-tooltip-panel .panel-arrowcontent { @@ -306,6 +315,10 @@ div.CodeMirror span.eval-text { border-bottom: 1px solid #A09090; } +.theme-tooltip-panel .devtools-tooltip-font-previewer-text { + color: FF9F00; +} + .theme-tooltip-panel .devtools-tooltip-simple-text:last-child { border-bottom: 0; } diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index 6b514636..b52494ba 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -111,7 +111,7 @@ window { /* Network requests table: specific column dimensions */ .requests-menu-status-and-method { - width: 8em; + width: 12em; } .requests-menu-status { @@ -248,12 +248,12 @@ box.requests-menu-status[code^="5"] { } .requests-menu-timings-division[division-scale=second] { - -moz-border-start-color: #E7ADE7 !important; /* Light orange highlight color */ + -moz-border-start-color: #FF9F00 !important; /* Light foreground text */ font-weight: 600; } .requests-menu-timings-division[division-scale=minute] { - -moz-border-start-color: #FF0000 !important; /* Red highlight color */ + -moz-border-start-color: #FF9F00 !important; /* Light foreground text */ font-weight: 600; } @@ -647,20 +647,4 @@ box.requests-menu-status[code^="5"] { } } -@media (min-width: 701px) { - #network-table[type-overflows] .requests-menu-domain { - border-width: 0 !important; - box-shadow: none !important; - /* The "Type" header is not visible anymore, and thus the - right border and box-shadow of "Domain" column should be hidden. */ - } - - #network-table[domain-overflows] .requests-menu-icon-and-file { - border-width: 0 !important; - box-shadow: none !important; - /* The "Domain" header is not visible anymore, and thus the - right border and box-shadow of "File" column should be hidden. */ - } -} - /* === END netmonitor.inc.css === */ diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index 67d3f4f6..f221fd60 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -401,6 +401,33 @@ a { flex: 1 1 auto; } +.cm-s-mozilla a[class] { + font-style: italic; + text-decoration: none; +} + +.cm-s-mozilla a[class]:hover, +.cm-s-mozilla a[class]:focus { + text-decoration: underline; +} + +/* Open DOMNode in inspector button */ +.open-inspector { + background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0; + padding-left: 16px; + margin-left: 5px; + cursor: pointer; +} + +.elementNode:hover .open-inspector, +.open-inspector:hover { + background-position: -32px 0; +} + +.open-inspector:active { + background-position: -16px 0; +} + /* Replace these values with CSS variables as available */ .theme-dark .jsterm-input-container { background-color: #000000; /* tabToolbarBackgroundColor */ diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index 26e7ce4e..078a5f59 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -21,6 +21,7 @@ #downloadsHistory { cursor: pointer; margin: 4px !important; + color: #3333FF; } #downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus { @@ -32,6 +33,15 @@ border: none; } +#downloadsPanel[hasdownloads] > #downloadsFooter { +} + +#downloadsPanel[hasdownloads] > #downloadsFooter:hover { +} + +#downloadsPanel[hasdownloads] > #downloadsFooter:hover:active { +} + /*** Downloads Summary and List items ***/ #downloadsSummary, @@ -152,6 +162,9 @@ richlistitem[type="download"]:first-child { cursor: pointer; } +#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active { +} + /*** Button icons ***/ .downloadButton.downloadCancel { -- 2.35.3