Bug 1023546 - DevTools - Support HDPI resolutions for Windows. r=bgrins
authorTim Nguyen <ntim.bugs@gmail.com>
Tue, 28 Apr 2015 07:30:00 -0400
changeset 271256 d925799e0a8a9605bde51058fc4ea5f408a7e9dd
parent 271255 ab89cbfcd3e6a3389e75442331253ee5b08d5454
child 271257 def73891e5bfa142271a5411f50da39cf3acbed8
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1023546
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1023546 - DevTools - Support HDPI resolutions for Windows. r=bgrins
browser/devtools/shared/widgets/spectrum.css
browser/devtools/sourceeditor/codemirror/mozilla.css
browser/themes/shared/devtools/animationinspector.css
browser/themes/shared/devtools/canvasdebugger.inc.css
browser/themes/shared/devtools/commandline.inc.css
browser/themes/shared/devtools/computedview.css
browser/themes/shared/devtools/dark-theme.css
browser/themes/shared/devtools/debugger.inc.css
browser/themes/shared/devtools/inspector.css
browser/themes/shared/devtools/light-theme.css
browser/themes/shared/devtools/netmonitor.inc.css
browser/themes/shared/devtools/performance.inc.css
browser/themes/shared/devtools/profiler.inc.css
browser/themes/shared/devtools/responsivedesign.inc.css
browser/themes/shared/devtools/ruleview.css
browser/themes/shared/devtools/shadereditor.inc.css
browser/themes/shared/devtools/styleeditor.css
browser/themes/shared/devtools/toolbars.inc.css
browser/themes/shared/devtools/webaudioeditor.inc.css
browser/themes/shared/devtools/webconsole.inc.css
browser/themes/shared/devtools/widgets.inc.css
--- a/browser/devtools/shared/widgets/spectrum.css
+++ b/browser/devtools/shared/widgets/spectrum.css
@@ -28,17 +28,17 @@
 }
 #eyedropper-button:hover:active {
   background-position: -32px center;
 }
 #eyedropper-button[checked=true] {
   background-position: -48px center;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #eyedropper-button {
     background-image: url("chrome://browser/skin/devtools/command-eyedropper@2x.png");
   }
 }
 
 /* Mix-in classes */
 
 .spectrum-checker {
--- a/browser/devtools/sourceeditor/codemirror/mozilla.css
+++ b/browser/devtools/sourceeditor/codemirror/mozilla.css
@@ -37,43 +37,43 @@
   opacity: 0.75;
 }
 
 .breakpoint {
   background-image: url("chrome://browser/skin/devtools/editor-breakpoint.png");
   position: relative;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .breakpoint {
     background-image: url("chrome://browser/skin/devtools/editor-breakpoint@2x.png");
   }
 }
 
 .breakpoint[adding] {
   transition: transform .25s;
 }
 
 .debugLocation {
   background-image: url("chrome://browser/skin/devtools/editor-debug-location.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .debugLocation {
     background-image: url("chrome://browser/skin/devtools/editor-debug-location@2x.png");
   }
 }
 
 .breakpoint.debugLocation {
   background-image:
     url("chrome://browser/skin/devtools/editor-debug-location.png"),
     url("chrome://browser/skin/devtools/editor-breakpoint.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .breakpoint.debugLocation {
     background-image:
       url("chrome://browser/skin/devtools/editor-debug-location@2x.png"),
       url("chrome://browser/skin/devtools/editor-breakpoint@2x.png");
   }
 }
 
 .CodeMirror {
--- a/browser/themes/shared/devtools/animationinspector.css
+++ b/browser/themes/shared/devtools/animationinspector.css
@@ -79,17 +79,17 @@ body {
   background-position: -48px 0;
   filter: none; /* Icon is blue when checked, don't invert for light theme */
 }
 
 #toggle-all.paused::before {
   background-image: url("debugger-play.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #element-picker::before {
     background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
     background-size: 64px;
   }
 
   #toggle-all::before {
     background-image: url("debugger-pause@2x.png");
   }
@@ -151,17 +151,17 @@ body {
 .timeline .ff::before {
   background-image: url(fast-forward.png);
 }
 
 .timeline .rw::before {
   background-image: url(rewind.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .timeline .toggle::before {
     background-image: url(debugger-pause@2x.png);
   }
 
   .paused .timeline .toggle::before,
   .finished .timeline .toggle::before {
     background-image: url(debugger-play@2x.png);
   }
--- a/browser/themes/shared/devtools/canvasdebugger.inc.css
+++ b/browser/themes/shared/devtools/canvasdebugger.inc.css
@@ -140,17 +140,17 @@
 #step-in {
   list-style-image: url(debugger-step-in.png);
 }
 
 #step-out {
   list-style-image: url(debugger-step-out.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #resume {
     list-style-image: url(debugger-play@2x.png);
     -moz-image-region: rect(0px,64px,32px,32px);
   }
 
   #step-over {
     list-style-image: url(debugger-step-over@2x.png);
   }
@@ -245,17 +245,17 @@
 
 .selected .call-item-gutter {
   background-image: url("editor-debug-location.png");
   background-repeat: no-repeat;
   background-position: 6px center;
   background-size: 12px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .selected .call-item-gutter {
     background-image: url("editor-debug-location@2x.png");
   }
 }
 
 .call-item-gutter {
   background-color: var(--theme-sidebar-background);
   color: var(--theme-content-color3);
--- a/browser/themes/shared/devtools/commandline.inc.css
+++ b/browser/themes/shared/devtools/commandline.inc.css
@@ -77,17 +77,17 @@
 #developer-toolbar-toolbox-button:hover:active {
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
 #developer-toolbar-toolbox-button[checked=true] {
   -moz-image-region: rect(0px, 64px, 16px, 48px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #developer-toolbar-toolbox-button {
     list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
   #developer-toolbar-toolbox-button:hover {
     -moz-image-region: rect(0px, 64px, 32px, 32px);
   }
@@ -106,17 +106,17 @@
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
   min-width: 16px;
   width: 16px;
   opacity: 0.6;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #developer-toolbar-closebutton {
     list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
   }
 }
 
 #developer-toolbar-closebutton > .toolbarbutton-icon {
   /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
      use evil CSS to give the impression of smaller content */
@@ -194,17 +194,17 @@ html|*#gcli-output-frame {
   background-position: 0 center;
   background-size: 32px 16px;
 }
 
 .gclitoolbar-input-node[focused="true"]::before {
   background-position: -16px center;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .gclitoolbar-input-node::before {
     background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
   }
 }
 
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
--- a/browser/themes/shared/devtools/computedview.css
+++ b/browser/themes/shared/devtools/computedview.css
@@ -56,17 +56,17 @@ body {
 }
 
 .property-value, .other-property-value {
   background-image: url(arrow-e.png);
   background-repeat: no-repeat;
   background-size: 5px 8px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .property-value, .other-property-value {
     background-image: url(arrow-e@2x.png);
   }
 }
 
 .property-value {
   width: 100%;
   overflow-x: hidden;
--- a/browser/themes/shared/devtools/dark-theme.css
+++ b/browser/themes/shared/devtools/dark-theme.css
@@ -321,17 +321,17 @@ div.CodeMirror span.eval-text {
   outline: none;
   background-position: -28px 0;
 }
 
 .theme-checkbox[checked] {
   background-position: -42px 0;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .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 {
@@ -359,17 +359,17 @@ div.CodeMirror span.eval-text {
   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) {
+@media (min-resolution: 1.25dppx) {
   .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");
--- a/browser/themes/shared/devtools/debugger.inc.css
+++ b/browser/themes/shared/devtools/debugger.inc.css
@@ -61,51 +61,51 @@
 #sources-controls > .devtools-toolbarbutton {
   min-width: 32px;
 }
 
 #black-box {
   list-style-image: url(debugger-blackbox.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #black-box {
     list-style-image: url(debugger-blackbox@2x.png);
   }
 }
 
 #pretty-print {
   list-style-image: url(debugger-prettyprint.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #pretty-print {
     list-style-image: url(debugger-prettyprint@2x.png);
   }
 }
 
 #toggle-breakpoints {
   list-style-image: url(debugger-toggleBreakpoints.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #toggle-breakpoints {
     list-style-image: url(debugger-toggleBreakpoints@2x.png);
   }
 }
 
 #sources-toolbar .devtools-toolbarbutton:not([label]) {
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
 #sources-toolbar .devtools-toolbarbutton:not([label])[checked] {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #sources-toolbar .devtools-toolbarbutton:not([label]) {
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #sources-toolbar .devtools-toolbarbutton:not([label])[checked] {
     -moz-image-region: rect(0px,64px,32px,32px);
   }
 }
@@ -129,17 +129,17 @@
   height: 16px;
   background-image: url(debugger-blackbox.png);
   background-position: 0 0;
   background-size: 32px 16px;
   background-repeat: no-repeat;
   -moz-margin-end: 5px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #black-boxed-message-button > .button-box > .button-icon {
     background-image: url(debugger-blackbox@2x.png);
   }
 }
 
 /* Black box message and source progress meter */
 
 #black-boxed-message,
@@ -217,17 +217,17 @@
   list-style-image: url(tracer-icon.png);
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
 #trace[checked] {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #trace {
     list-style-image: url(tracer-icon@2x.png);
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #trace[checked] {
     -moz-image-region: rect(0px,64px,32px,32px);
   }
@@ -319,17 +319,17 @@
   background-position: -16px 0;
   background-repeat: no-repeat;
   background-size: 32px 16px;
   width: 16px;
   height: 16px;
   margin: 2px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .dbg-expression-arrow {
     background-image: url(commandline-icon@2x.png);
   }
 }
 
 .dbg-expression-input {
   color: inherit;
 }
@@ -555,17 +555,17 @@
   list-style-image: url(debugger-pause.png);
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
 #resume[checked] {
   list-style-image: url(debugger-play.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #resume {
     list-style-image: url(debugger-pause@2x.png);
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #resume[checked] {
     list-style-image: url(debugger-play@2x.png);
     -moz-image-region: rect(0px,64px,32px,32px);
@@ -587,17 +587,17 @@
 #step-in {
   list-style-image: url(debugger-step-in.png);
 }
 
 #step-out {
   list-style-image: url(debugger-step-out.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #step-over {
     list-style-image: url(debugger-step-over@2x.png);
   }
 
   #step-in {
     list-style-image: url(debugger-step-in@2x.png);
   }
 
@@ -617,17 +617,17 @@
 #instruments-pane-toggle[pane-collapsed] {
   list-style-image: url(debugger-expand.png);
 }
 
 #instruments-pane-toggle:hover {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #instruments-pane-toggle {
     list-style-image: url(debugger-collapse@2x.png);
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #instruments-pane-toggle[pane-collapsed] {
     list-style-image: url(debugger-expand@2x.png);
   }
--- a/browser/themes/shared/devtools/inspector.css
+++ b/browser/themes/shared/devtools/inspector.css
@@ -55,17 +55,17 @@
 #inspector-pane-toggle[pane-collapsed] {
   list-style-image: url(debugger-expand.png);
 }
 
 #inspector-pane-toggle:active {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #inspector-pane-toggle {
     list-style-image: url(debugger-collapse@2x.png);
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #inspector-pane-toggle[pane-collapsed] {
     list-style-image: url(debugger-expand@2x.png);
   }
--- a/browser/themes/shared/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -330,17 +330,17 @@ div.CodeMirror span.eval-text {
   outline: none;
   background-position: 0 0;
 }
 
 .theme-checkbox[checked] {
   background-position: -14px 0;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .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 {
@@ -368,17 +368,17 @@ div.CodeMirror span.eval-text {
   margin-right: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="right"] {
   list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-light.png");
   margin-left: -4px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .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-light@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-light@2x.png");
--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -465,17 +465,17 @@ label.requests-menu-status-code {
 #details-pane-toggle[pane-collapsed] {
   list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
 }
 
 #details-pane-toggle:active {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #details-pane-toggle {
     list-style-image: url("chrome://browser/skin/devtools/debugger-collapse@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #details-pane-toggle[pane-collapsed] {
     list-style-image: url("chrome://browser/skin/devtools/debugger-expand@2x.png");
   }
@@ -598,17 +598,17 @@ label.requests-menu-status-code {
   background-image: url(alerticon-warning.png);
   background-size: 13px 12px;
   -moz-margin-start: 5px;
   vertical-align: top;
   width: 13px;
   height: 12px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .security-warning-icon {
     background-image: url(alerticon-warning@2x.png);
   }
 }
 
 /* Custom request form */
 
 #custom-pane {
--- a/browser/themes/shared/devtools/performance.inc.css
+++ b/browser/themes/shared/devtools/performance.inc.css
@@ -276,17 +276,17 @@
 .theme-dark .call-tree-zoom {
   background-image: url(magnifying-glass.png);
 }
 
 .theme-light .call-tree-zoom {
   background-image: url(magnifying-glass-light.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .theme-dark .call-tree-zoom {
     background-image: url(magnifying-glass@2x.png);
   }
 
   .theme-light .call-tree-zoom {
     background-image: url(magnifying-glass-light@2x.png);
   }
 }
@@ -605,13 +605,13 @@
   max-height: 8px;
   display: inline-block;
 }
 
 #jit-optimizations-view .opt-icon[severity=warning]::before {
   background-position: -16px -16px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #jit-optimizations-view .opt-icon::before {
     background-image: url(chrome://browser/skin/devtools/webconsole@2x.png);
   }
 }
--- a/browser/themes/shared/devtools/profiler.inc.css
+++ b/browser/themes/shared/devtools/profiler.inc.css
@@ -185,17 +185,17 @@
 .theme-dark #profile-newtab-button {
   background-image: url(newtab-inverted.png);
 }
 
 .theme-light #profile-newtab-button {
   background-image: url(newtab.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .theme-dark #profile-newtab-button {
     background-image: url(newtab-inverted@2x.png);
   }
 
   .theme-light #profile-newtab-button {
     background-image: url(newtab@2x.png);
   }
 }
@@ -362,17 +362,17 @@
 .theme-dark .call-tree-zoom {
   background-image: url(magnifying-glass.png);
 }
 
 .theme-light .call-tree-zoom {
   background-image: url(magnifying-glass-light.png);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .theme-dark .call-tree-zoom {
     background-image: url(magnifying-glass@2x.png);
   }
 
   .theme-light .call-tree-zoom {
     background-image: url(magnifying-glass-light@2x.png);
   }
 }
--- a/browser/themes/shared/devtools/responsivedesign.inc.css
+++ b/browser/themes/shared/devtools/responsivedesign.inc.css
@@ -150,17 +150,17 @@
 .devtools-responsiveui-close {
   list-style-image: url("chrome://browser/skin/devtools/close.png");
 }
 
 .devtools-responsiveui-rotate {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .devtools-responsiveui-close {
     list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
   }
 
   .devtools-responsiveui-rotate {
     list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
   }
 }
@@ -169,32 +169,32 @@
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
 .devtools-responsiveui-touch[checked] {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .devtools-responsiveui-touch {
     list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   .devtools-responsiveui-touch[checked] {
     -moz-image-region: rect(0px,64px,32px,32px);
   }
 }
 
 .devtools-responsiveui-screenshot {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .devtools-responsiveui-screenshot {
     list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
   }
 }
 
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
@@ -316,17 +316,17 @@
 .devtools-responsiveui-volume-up-button {
   border-top-left-radius: 12px;
 }
 
 .devtools-responsiveui-volume-down-button {
   border-bottom-left-radius: 12px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .devtools-responsiveui-resizebarV {
     background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizebarH {
     background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
   }
 
--- a/browser/themes/shared/devtools/ruleview.css
+++ b/browser/themes/shared/devtools/ruleview.css
@@ -102,17 +102,17 @@
   -moz-margin-start: 5px;
   display: inline-block;
   vertical-align: top;
   width: 13px;
   height: 12px;
 }
 
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .ruleview-warning {
     background-image: url(alerticon-warning@2x.png);
   }
 }
 
 .ruleview-ruleopen {
   -moz-padding-end: 5px;
 }
@@ -189,17 +189,17 @@
   background-size: 1em;
 }
 
 .ruleview-filterswatch {
   background: url("chrome://browser/skin/devtools/filter-swatch.svg");
   background-size: 1em;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .ruleview-bezierswatch {
     background: url("chrome://browser/skin/devtools/cubic-bezier-swatch@2x.png");
     background-size: 1em;
   }
 }
 
 .ruleview-overridden {
   text-decoration: line-through;
--- a/browser/themes/shared/devtools/shadereditor.inc.css
+++ b/browser/themes/shared/devtools/shadereditor.inc.css
@@ -55,17 +55,17 @@
   background-clip: content-box;
   background-size: 32px 16px;
   background-position: -16px 0;
   width: 16px;
   height: 16px;
   border: 0;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .side-menu-widget-item-checkbox .checkbox-check {
     background-image: url(itemToggle@2x.png);
   }
 }
 
 .side-menu-widget-item-checkbox[checked] .checkbox-check {
   background-position: 0 0;
 }
--- a/browser/themes/shared/devtools/styleeditor.css
+++ b/browser/themes/shared/devtools/styleeditor.css
@@ -110,17 +110,17 @@
   background-repeat: no-repeat;
   background-clip: content-box;
   background-position: 0 8px;
   background-size: 48px 24px;
   width: 24px;
   height: 40px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .stylesheet-enabled {
     background-image: url(itemToggle@2x.png);
   }
 }
 
 .disabled > .stylesheet-enabled {
   background-position: -24px 8px;
 }
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -311,17 +311,17 @@
   height: 16px;
   position: absolute;
   left: 50%;
   top: 50%;
   margin: -8px 0 0 -8px;
   background-repeat: no-repeat;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .devtools-button::before {
     background-size: 32px;
   }
 }
 
 /* Text input */
 
 .devtools-textinput,
@@ -432,17 +432,17 @@
   list-style-image: url("chrome://browser/skin/devtools/search-clear-light.svg");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .theme-dark .devtools-searchinput {
     background-image: url(magnifying-glass@2x.png);
   }
 
   .theme-light .devtools-searchinput {
     background-image: url(magnifying-glass-light@2x.png);
   }
 }
@@ -764,17 +764,17 @@
 #command-button-eyedropper > image {
   background-image: url("chrome://browser/skin/devtools/command-eyedropper.png");
 }
 
 #command-button-rulers > image {
   background-image: url("chrome://browser/skin/devtools/command-rulers.png");
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #command-button-paintflashing > image {
     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");
   }
 
--- a/browser/themes/shared/devtools/webaudioeditor.inc.css
+++ b/browser/themes/shared/devtools/webaudioeditor.inc.css
@@ -182,17 +182,17 @@ text {
   background-color: var(--theme-selection-background);
 }
 
 #automation-graph {
   overflow: hidden;
   -moz-box-flex: 1;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   #inspector-pane-toggle {
     list-style-image: url(debugger-collapse@2x.png);
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #inspector-pane-toggle[pane-collapsed] {
     list-style-image: url(debugger-expand@2x.png);
   }
--- a/browser/themes/shared/devtools/webconsole.inc.css
+++ b/browser/themes/shared/devtools/webconsole.inc.css
@@ -47,17 +47,17 @@ a {
   background-position: 8px 8px;
   background-repeat: no-repeat;
   background-size: 48px 40px;
   width: 8px;
   height: 8px;
   display: inline-block;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .message > .icon::before {
     background-image: url(chrome://browser/skin/devtools/webconsole@2x.png);
   }
 }
 
 .message > .message-body-wrapper {
   flex: 1 1 100%;
   margin: 3px;
@@ -356,17 +356,17 @@ a {
 }
 
 .jsterm-input-node {
   background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
   background-repeat: no-repeat;
   background-size: 16px 16px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .jsterm-input-node {
     background-image: -moz-image-rect(url('chrome://browser/skin/devtools/commandline-icon@2x.png'), 0, 64, 32, 32);
   }
 }
 
 :-moz-any(.jsterm-input-node,
           .jsterm-complete-node) > .textbox-input-box > .textbox-textarea {
   overflow-x: hidden;
--- a/browser/themes/shared/devtools/widgets.inc.css
+++ b/browser/themes/shared/devtools/widgets.inc.css
@@ -102,17 +102,17 @@
   background-position: 0 center;
   background-repeat: no-repeat;
   background-image: url("breadcrumbs-scrollbutton.png");
   list-style-image: none;
   margin: 0 8px;
   padding: 0;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .scrollbutton-up > .toolbarbutton-icon,
   .scrollbutton-down > .toolbarbutton-icon {
     background-image: url("breadcrumbs-scrollbutton@2x.png");
   }
 }
 
 .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
 .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
@@ -632,17 +632,17 @@
 
 .variable-or-property-non-writable-icon {
   background: url("chrome://browser/skin/devtools/vview-lock.png") no-repeat;
   background-size: cover;
   width: 16px;
   height: 16px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .variable-or-property-non-writable-icon {
     background-image: url("chrome://browser/skin/devtools/vview-lock@2x.png");
   }
 }
 
 .variable-or-property-frozen-label,
 .variable-or-property-sealed-label,
 .variable-or-property-non-extensible-label {
@@ -732,17 +732,17 @@
 
 .variables-view-delete {
   background: url("chrome://browser/skin/devtools/vview-delete.png");
   background-size: cover;
   width: 16px;
   height: 16px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .variables-view-delete {
     background-image: url("chrome://browser/skin/devtools/vview-delete@2x.png");
   }
 }
 
 .variables-view-delete:hover {
   background-position: 16px;
 }
@@ -758,17 +758,17 @@
 .variables-view-edit {
   background: url("chrome://browser/skin/devtools/vview-edit.png");
   background-size: cover;
   width: 16px;
   height: 16px;
   cursor: pointer;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .variables-view-edit {
     background-image: url("chrome://browser/skin/devtools/vview-edit@2x.png");
   }
 }
 
 .variables-view-edit:hover {
   background-position: 16px;
 }
@@ -784,17 +784,17 @@
 .variables-view-open-inspector {
   background: url("chrome://browser/skin/devtools/vview-open-inspector.png");
   background-size: cover;
   width: 16px;
   height: 16px;
   cursor: pointer;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .variables-view-open-inspector {
     background-image: url("chrome://browser/skin/devtools/vview-open-inspector@2x.png");
   }
 }
 
 .variables-view-open-inspector:hover {
   background-position: 16px;
 }
@@ -1432,17 +1432,17 @@
   from {
     max-height: 0;
   }
   to {
     max-height: 500px;
   }
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.25dppx) {
   .tree-widget-item:before {
     background-image: url("chrome://browser/skin/devtools/controls@2x.png");
   }
 }
 
 /* Indentation of child items in the tree */
 
 /* For level > 6 */