From 589b5528220a57ff70809bd8ef0eeaf51a0c8b2f Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 9 Aug 2014 22:33:37 +0200 Subject: [PATCH] fourth and final part of syncing LCARStrek with Firefox 31 windows theme changes --- LCARStrek/browser/browser.css | 50 ++++--- .../browser/customizableui/panelUIOverlay.css | 13 +- LCARStrek/browser/devtools/canvasdebugger.css | 8 ++ .../browser/devtools/command-screenshot.png | Bin 0 -> 218 bytes .../devtools/command-screenshot@2x.png | Bin 0 -> 257 bytes LCARStrek/browser/devtools/commandline.css | 7 +- LCARStrek/browser/devtools/common.css | 16 +++ LCARStrek/browser/devtools/dark-theme.css | 16 ++- LCARStrek/browser/devtools/filters.svg | 9 +- .../profiler-stopwatch-checked-tbutton.svg | 14 ++ .../devtools/profiler-stopwatch-checked.svg | 14 ++ .../devtools/profiler-stopwatch-tbutton.svg | 14 ++ .../browser/devtools/profiler-stopwatch.svg | 14 ++ LCARStrek/browser/devtools/ruleview.css | 4 +- LCARStrek/browser/devtools/tool-webaudio.svg | 3 + LCARStrek/browser/devtools/webconsole.css | 122 ++++++++++++------ LCARStrek/browser/downloads/downloads.css | 15 ++- LCARStrek/browser/downloads/indicator.css | 4 +- .../preferences/in-content/preferences.css | 62 ++++++--- 19 files changed, 278 insertions(+), 107 deletions(-) create mode 100644 LCARStrek/browser/devtools/command-screenshot.png create mode 100644 LCARStrek/browser/devtools/command-screenshot@2x.png create mode 100644 LCARStrek/browser/devtools/profiler-stopwatch-checked-tbutton.svg create mode 100644 LCARStrek/browser/devtools/profiler-stopwatch-checked.svg create mode 100644 LCARStrek/browser/devtools/profiler-stopwatch-tbutton.svg create mode 100644 LCARStrek/browser/devtools/profiler-stopwatch.svg create mode 100644 LCARStrek/browser/devtools/tool-webaudio.svg diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index fc84ce15..d934d438 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1358,6 +1358,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope /* unified back/forward button */ #forward-button { + -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */ } #forward-button > menupopup { @@ -1427,20 +1428,23 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but background-clip: padding-box !important; /* background-color: hsla(210,25%,98%,.08) !important; padding: 6px !important; - border-color: hsla(210,4%,10%,.25) !important;*/ - transition-property: background-color, border-color !important; + border-style: none !important; + box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25), + 0 0 0 1px hsla(210,4%,10%,.25);*/ + transition-property: background-color, box-shadow !important; transition-duration: 250ms !important; } #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon { -/* background-color: hsla(210,4%,10%,.08) !important; - box-shadow: none !important;*/ +/* background-color: hsla(210,4%,10%,.08) !important;*/ } #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon, #back-button[open="true"] > .toolbarbutton-icon { /* background-color: hsla(210,4%,10%,.12) !important; - box-shadow: 0 1px 0 0 hsla(210,80%,20%,.1) inset !important;*/ + box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25), + 0 0 0 1px hsla(210,4%,10%,.25), + 0 1px 0 0 hsla(210,80%,20%,.1) inset !important;*/ } #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { @@ -2285,6 +2289,18 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { -moz-padding-start: 0px; } +#sidebar-header > .close-icon { +/* padding: 4px 2px; + margin: 0; + border: none;*/ + list-style-image: url("chrome://global/skin/icons/close-button.gif"); +} + +#sidebar-header > .close-icon:hover, +#sidebar-header > .close-icon:hover:active { + list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); +} + .browserContainer > findbar { /* background-color: -moz-dialog; @@ -2611,26 +2627,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { background-color: #402800; } -/* Tabstrip close button */ -.tabs-closebutton { - -moz-box-flex: 1; - margin: 0px; - padding: 2px; - list-style-image: url("chrome://global/skin/icons/close-button.gif"); -} - -.tabs-closebutton > .toolbarbutton-icon { -} - -.tabs-closebutton > .toolbarbutton-text { - display: none; -} - -.tabs-closebutton:hover, -.tabs-closebutton:hover:active { - list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); -} - toolbarbutton.chevron { list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; } @@ -2908,8 +2904,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { border-right-width: 8px; } -window:not([chromehidden~="toolbar"]) #urlbar-wrapper[forwarddisabled] > #urlbar > #notification-popup-box { -/* padding-left: 5px; */ +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box { +/* padding-left: 7px; */ } #notification-popup-box:-moz-locale-dir(rtl), diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index e280b46d..606b7c6b 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -753,17 +753,8 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), } #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 - * refuse to scroll for us (see bug 984156). Instead, we set it to visibility hidden, force - * a minimum height, and then negative-margin that single pixel into oblivion. That seems - * to be enough to make scrollbox happy. - / - -moz-appearance: none; - visibility: hidden; - min-height: 1px; - margin: -1px 0 0; - border: none; + / Hide bottom separator as the styled footer includes a top border serving the same purpose / + display: none; } / Popups with only one item don't have a footer / diff --git a/LCARStrek/browser/devtools/canvasdebugger.css b/LCARStrek/browser/devtools/canvasdebugger.css index c1d69b38..295f485a 100644 --- a/LCARStrek/browser/devtools/canvasdebugger.css +++ b/LCARStrek/browser/devtools/canvasdebugger.css @@ -41,10 +41,18 @@ } #record-snapshot { + list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-tbutton.svg"); +} + +#record-snapshot:hover { list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch.svg"); } #record-snapshot[checked] { + list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-checked-tbutton.svg"); +} + +#record-snapshot[checked]:hover { list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-checked.svg"); } diff --git a/LCARStrek/browser/devtools/command-screenshot.png b/LCARStrek/browser/devtools/command-screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf4113d98be204d6043f36621420325e0cdd740 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et#0(_4@}`~wQk(%kA+ACU9YE&)^9&wgH_icB zj3q&S!3+-1Zlr-YN#5=*3>~bp9w6lf9+AZi4BWyX%*Zfnjs#GUy~NYkmHi$Er-(4a z<%pSGKp`(r7sn8e>&XcRSfaEgBwU;wdO`)-uB{5yc5!xgme?XzuvUOKfz?QAMp%cH z0h6Q;ueOV%Yy;0aR&AF^<_VGonmdwql+9=a8vn#g^7MwSg=c`KGI+ZBxvXYh7ML)50LT#kH}&M25w;xW@MN(M*=9wUgGKN%6^Z7Q$$26 zvHF`iP^i$;#W6(V{Mri#c@HRXum+esd~{cJ&LKgY6Lx)%E*hjVS19{R->$##At{8x z!Y66oCgniu=_h6hdIW!MNm=B%d!nFk){RXJT^{Tw)PlvQFl}Fw*_3-)L%ZwBox@^j t!i(}B<$YWKTmF|`&GPlnK5N)NW#X999I)@0`x2n#44$rjF6*2UngBkXR0RM4 literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/devtools/commandline.css b/LCARStrek/browser/devtools/commandline.css index 1163245e..cae01b8d 100644 --- a/LCARStrek/browser/devtools/commandline.css +++ b/LCARStrek/browser/devtools/commandline.css @@ -120,13 +120,14 @@ color: #FF9F00; } -.gcli-menu-option:hover, -.gcli-menu-highlight.gcli-menu-option:hover { +.gcli-menu-name:hover, +.gcli-menu-desc:hover { background-color: #FFCF00; color: #000000; } -.gcli-menu-highlight { +.gcli-menu-highlight, +.gcli-menu-highlight:hover { background-color: #795900; } diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index 126b2cb1..6d8d2e7b 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -245,4 +245,20 @@ notification { background-position: 0 0, 10px 10px; } +.devtools-tooltip-iframe { + border: none; + background: transparent; +} + +/* Eyedropper Widget */ + +.devtools-eyedropper-panel { + pointer-events: none; + -moz-appearance: none; + width: 156px; + height: 120px; + background-color: transparent; + border: none; +} + /* === END common.inc.css === */ diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 1598355f..48def113 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -128,7 +128,8 @@ .theme-toolbar, .devtools-toolbar, -.devtools-sidebar-tabs > tabs { /* General toolbar styling */ +.devtools-sidebar-tabs > tabs, +.CodeMirror-dialog { /* General toolbar styling */ } @@ -385,15 +386,14 @@ devtools-menulist:-moz-focusring, } .devtools-option-toolbarbutton { - list-style-image: url("chrome://browser/skin/devtools/option-icon.png"); - -moz-image-region: rect(0px 16px 16px 0px); + list-style-image: url("chrome://browser/skin/devtools/tool-options-tbutton.svg"); /* background: none; border: none; */ } .devtools-option-toolbarbutton:hover, .devtools-option-toolbarbutton[open=true] { - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/devtools/tool-options.svg"); } .devtools-menulist > .menulist-label-box { @@ -663,6 +663,10 @@ devtools-menulist:-moz-focusring, background-image: url("chrome://browser/skin/devtools/command-paintflashing.png"); } +#command-button-screenshot > image { + background-image: url("chrome://browser/skin/devtools/command-screenshot.png"); +} + #command-button-responsive > image { background-image: url("chrome://browser/skin/devtools/command-responsivemode.png"); } @@ -692,6 +696,10 @@ devtools-menulist:-moz-focusring, background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png"); } + #command-button-screenshot > image { + background-image: url("chrome://browser/skin/devtools/command-screenshot@2x.png"); + } + #command-button-responsive > image { background-image: url("chrome://browser/skin/devtools/command-responsivemode@2x.png"); } diff --git a/LCARStrek/browser/devtools/filters.svg b/LCARStrek/browser/devtools/filters.svg index 9a50a6cc..69c6bc3e 100644 --- a/LCARStrek/browser/devtools/filters.svg +++ b/LCARStrek/browser/devtools/filters.svg @@ -6,4 +6,11 @@ - \ No newline at end of file + + + + + + + + diff --git a/LCARStrek/browser/devtools/profiler-stopwatch-checked-tbutton.svg b/LCARStrek/browser/devtools/profiler-stopwatch-checked-tbutton.svg new file mode 100644 index 00000000..2d4cd4c3 --- /dev/null +++ b/LCARStrek/browser/devtools/profiler-stopwatch-checked-tbutton.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/profiler-stopwatch-checked.svg b/LCARStrek/browser/devtools/profiler-stopwatch-checked.svg new file mode 100644 index 00000000..97b536b2 --- /dev/null +++ b/LCARStrek/browser/devtools/profiler-stopwatch-checked.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/profiler-stopwatch-tbutton.svg b/LCARStrek/browser/devtools/profiler-stopwatch-tbutton.svg new file mode 100644 index 00000000..2d4cd4c3 --- /dev/null +++ b/LCARStrek/browser/devtools/profiler-stopwatch-tbutton.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/profiler-stopwatch.svg b/LCARStrek/browser/devtools/profiler-stopwatch.svg new file mode 100644 index 00000000..97b536b2 --- /dev/null +++ b/LCARStrek/browser/devtools/profiler-stopwatch.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index f999d6ef..2d595e14 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -115,7 +115,7 @@ } .ruleview-property { - border-left: 2px solid transparent; + border-left: 3px solid transparent; clear: right; } @@ -124,7 +124,7 @@ } .ruleview-property[dirty] { - border-left-color: #9C9CFF; + border-left-color: #9C9CFF; /* Green */ } .ruleview-namecontainer > .ruleview-propertyname, diff --git a/LCARStrek/browser/devtools/tool-webaudio.svg b/LCARStrek/browser/devtools/tool-webaudio.svg new file mode 100644 index 00000000..3f0e3604 --- /dev/null +++ b/LCARStrek/browser/devtools/tool-webaudio.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index f221fd60..dfd38971 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -33,31 +33,35 @@ a { .message { display: flex; flex: 0 0 auto; - -moz-margin-start: 6px; - -moz-margin-end: 8px; - width: calc(100% - 6px - 8px); + padding: 0 7px; + width: 100%; + box-sizing: border-box; } .message > .timestamp { flex: 0 0 auto; color: #8050B0; - margin: 4px 0; + margin: 4px 6px 0 0; +} + +.message > .indent { + flex: 0 0 auto; } .message > .icon { background: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 0, 1, 0, 0) no-repeat; - background-position: center 0.5em; + background-position: center; flex: 0 0 auto; - margin: 0 6px; + margin: 3px 6px 0 0; padding: 0 4px; width: 8px; + height: 1em; + align-self: flex-start; } -.message > .body { +.message > .message-body-wrapper { flex: 1 1 100%; - white-space: pre-wrap; - word-wrap: break-word; - margin-top: 4px; + margin: 3px; } /* The red bubble that shows the number of times a message is repeated */ @@ -80,13 +84,12 @@ a { } .message-location { - -moz-margin-start: 6px; display: flex; flex: 0 0 auto; align-self: flex-start; justify-content: flex-end; width: 10em; - margin-top: 4px; + margin-top: 3px; color: #3333FF; text-decoration: none; white-space: nowrap; @@ -113,6 +116,25 @@ a { color: inherit; } +.message-flex-body { + display: flex; +} + +.message-body { + white-space: pre-wrap; + word-wrap: break-word; +} + +.message-flex-body > .message-body { + display: block; + flex: 1 1 auto; + vertical-align: middle; +} + +.message-flex-body > .message-location { + margin-top: 0; +} + .jsterm-input-container { border-top-width: 1px; border-top-style: solid; @@ -131,10 +153,20 @@ a { align-items: flex-start; } +#output-container.hideTimestamps > .message { + -moz-padding-start: 0; + -moz-margin-start: 7px; + width: calc(100% - 7px); +} + #output-container.hideTimestamps > .message > .timestamp { display: none; } +#output-container.hideTimestamps > .message > .indent { + background-color: #000000; /* .theme-body */ +} + .filtered-by-type, .filtered-by-string { display: none; @@ -183,15 +215,23 @@ a { border-color: #FFCF00; } -.message[category=network] > .icon { - -moz-border-start: solid #FFCF00 6px; +.message[severity=error] { + background-color: #FF0000; +} + +.console-string { + color: #FF0000; +} + +.message[category=network] > .indent { + -moz-border-end: solid #FF0000 6px; } .message[category=network][severity=error] > .icon { background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 0, 16, 8, 8); } -.message[category=network] > .body { +.message[category=network] > .message-body { display: flex; } @@ -229,8 +269,8 @@ a { border-color: #9C9CFF; } -.message[category=cssparser] > .icon { - -moz-border-start: solid #9C9CFF 6px; +.message[category=cssparser] > .indent { + -moz-border-end: solid #9C9CFF 6px; } .message[category=cssparser][severity=error] > .icon { @@ -247,8 +287,8 @@ a { border-color: #FF9F00; } -.message[category=exception] > .icon { - -moz-border-start: solid #FF9F00 6px; +.message[category=exception] > .indent { + -moz-border-end: solid #FF9F00 6px; } .message[category=exception][severity=error] > .icon { @@ -265,8 +305,8 @@ a { border-color: #8050B0; } -.message[category=console] > .icon { - -moz-border-start: solid #8050B0 6px; +.message[category=console] > .indent { + -moz-border-end: solid #8050B0 6px; } .message[category=console][severity=error] > .icon, @@ -283,9 +323,9 @@ a { } /* Input and output styles */ -.message[category=input] > .icon, -.message[category=output] > .icon { - -moz-border-start: solid #A09090 6px; +.message[category=input] > .indent, +.message[category=output] > .indent { + -moz-border-end: solid #A09090 6px; } .message[category=input] > .icon { @@ -314,7 +354,7 @@ a { overflow-x: hidden; } -.inlined-variables-view .body { +.inlined-variables-view .message-body { display: flex; flex-direction: column; } @@ -340,8 +380,8 @@ a { /* Security styles */ -.message[category=security] > .icon { - -moz-border-start: solid #FF0000 6px; +.message[category=security] > .indent { + -moz-border-end: solid #FF0000 6px; } .webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { @@ -370,26 +410,30 @@ a { text-decoration: none; } -.consoleTrace .body > div { - display: flex; - margin-bottom: 5px; -} - -.consoleTrace .title { - display: block; - flex: 1 1 auto; -} - .stacktrace { + display: none; list-style: none; padding: 0 1em 0 1.5em; - margin: 0; + margin: 5px 0 0 0; max-height: 10em; overflow-y: auto; - border: 1px solid #A09090; border-radius: 3px; } + +.message[severity=error] .stacktrace { + background-color: #000000; +} + +.message[open] .stacktrace { + display: block; +} + +.message .theme-twisty { + display: inline-block; + vertical-align: middle; + margin: 0 3px 0 0; +} .stacktrace li { display: flex; diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index 078a5f59..e90d51e0 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -18,6 +18,15 @@ display: none; } +#downloadsPanel[hasdownloads] > #emptyDownloads { + display: none; +} + +#emptyDownloads { + padding: 10px 20px; + max-width: 40ch; +} + #downloadsHistory { cursor: pointer; margin: 4px !important; @@ -33,13 +42,13 @@ border: none; } -#downloadsPanel[hasdownloads] > #downloadsFooter { +#downloadsFooter { } -#downloadsPanel[hasdownloads] > #downloadsFooter:hover { +#downloadsFooter:hover { } -#downloadsPanel[hasdownloads] > #downloadsFooter:hover:active { +#downloadsFooter:hover:active { } /*** Downloads Summary and List items ***/ diff --git a/LCARStrek/browser/downloads/indicator.css b/LCARStrek/browser/downloads/indicator.css index 99585bc3..9b3e09ca 100644 --- a/LCARStrek/browser/downloads/indicator.css +++ b/LCARStrek/browser/downloads/indicator.css @@ -34,7 +34,7 @@ color: #000000; } -#downloads-indicator-icon:-moz-lwtheme-brighttext { +toolbar[brighttext] #downloads-button:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon { /* background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat;*/ } @@ -125,7 +125,7 @@ text-align: center; } -#downloads-indicator-counter:-moz-lwtheme-brighttext { +toolbar[brighttext] #downloads-indicator-counter { /* color: white; text-shadow: 0 0 1px rgba(0,0,0,.7), 0 1px 1.5px rgba(0,0,0,.5);*/ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index ac4160cf..c54cda05 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -8,7 +8,7 @@ @font-face { font-family: "Clear Sans"; - src: url("chrome://browser/skin/fonts/ClearSans-Regular.ttf"); + src: url("chrome://browser/content/fonts/ClearSans-Regular.woff") format('woff'); } page { @@ -28,15 +28,13 @@ caption { } .main-content { - max-width: 800px; -} - -prefpane > .content-box { + padding: 40px 48px 48px; overflow: auto; } prefpane { - padding: 40px 48px 48px; + max-width: 800px; + padding: 0; font-family: "Clear Sans", sans-serif; font-size: 1.25rem; line-height: 22px; @@ -44,7 +42,7 @@ prefpane { } prefpane > .content-box { - overflow: auto; + overflow: visible; } /* groupboxes */ @@ -345,31 +343,65 @@ radio[selected]::before { } #header-general > .header-icon { - -moz-image-region: rect(3px, 45px, 45px, 3px); + -moz-image-region: rect(0, 40px, 40px, 0); } #header-content > .header-icon { - -moz-image-region: rect(3px, 93px, 45px, 51px); + -moz-image-region: rect(0, 80px, 40px, 40px); } #header-application > .header-icon { - -moz-image-region: rect(3px, 141px, 45px, 99px); + -moz-image-region: rect(0, 120px, 40px, 80px); } #header-privacy > .header-icon { - -moz-image-region: rect(3px, 189px, 45px, 147px); + -moz-image-region: rect(0, 160px, 40px, 120px); } #header-security > .header-icon { - -moz-image-region: rect(3px, 237px, 45px, 195px); + -moz-image-region: rect(0, 200px, 40px, 160px); } #header-sync > .header-icon { - -moz-image-region: rect(3px, 285px, 45px, 243px); + -moz-image-region: rect(0, 240px, 40px, 200px); } #header-advanced > .header-icon { - -moz-image-region: rect(3px, 333px, 45px, 291px); + -moz-image-region: rect(0, 280px, 40px, 240px); +} + +@media (min-resolution: 2dppx) { + .header-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/header@2x.png"); + } + + #header-general > .header-icon { + -moz-image-region: rect(0, 80px, 80px, 0); + } + + #header-content > .header-icon { + -moz-image-region: rect(0, 160px, 80px, 80px); + } + + #header-application > .header-icon { + -moz-image-region: rect(0, 240px, 80px, 160px); + } + + #header-privacy > .header-icon { + -moz-image-region: rect(0, 320px, 80px, 240px); + } + + #header-security > .header-icon { + -moz-image-region: rect(0, 400px, 80px, 320px); + } + + #header-sync > .header-icon { + -moz-image-region: rect(0, 480px, 80px, 400px); + } + + #header-advanced > .header-icon { + -moz-image-region: rect(0, 560px, 80px, 480px); + } } .indent { @@ -462,7 +494,7 @@ filefield { #typeColumn > .treecol-sortdirection[sortDirection=ascending], #actionColumn > .treecol-sortdirection[sortDirection=ascending], #typeColumn > .treecol-sortdirection[sortDirection=descending], -#actionColumn > .treecol-sortdirection[sortDirection=descending] { +#actionColumn > .treecol-sortdirection[sortDirection=descending] { } #typeColumn > .treecol-sortdirection[sortDirection=descending], -- 2.43.0