From d44cc05c3d1476af76cc4f07f5347142a07f7f2a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 19 Mar 2018 13:46:50 -0700 Subject: [PATCH] Use 1.25dppx for HiDPI icon threshold On some laptops, scaling settings might cause the DPI to drop between 96 (1x) and 144 (1.5x), and downscaled icons are probably better than upscaled ones. --- chrome/content/zotero-platform/mac/itembox.css | 2 +- chrome/content/zotero-platform/mac/overlay.css | 2 +- chrome/content/zotero-platform/unix/overlay.css | 2 +- chrome/content/zotero-platform/win/overlay.css | 2 +- chrome/skin/default/zotero/bindings/attachmentbox.css | 2 +- chrome/skin/default/zotero/bindings/tagselector.css | 2 +- chrome/skin/default/zotero/overlay.css | 4 ++-- chrome/skin/default/zotero/zotero.css | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero-platform/mac/itembox.css b/chrome/content/zotero-platform/mac/itembox.css index 449e339c3..25e176242 100644 --- a/chrome/content/zotero-platform/mac/itembox.css +++ b/chrome/content/zotero-platform/mac/itembox.css @@ -33,6 +33,6 @@ textbox /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { .creator-type-label > image { list-style-image: url('chrome://zotero/skin/mac/arrow-down@2x.png'); } } diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index 77dc2e371..40b889016 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -491,7 +491,7 @@ treechildren::-moz-tree-image { /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { .zotero-tb-button,.zotero-tb-button:first-child,.zotero-tb-button:last-child { background: url("chrome://zotero/skin/mac/menubutton-end@2x.png") right center/auto 24px no-repeat; } .zotero-tb-button > .toolbarbutton-icon { background: url("chrome://zotero/skin/mac/menubutton-start@2x.png") left center/auto 24px no-repeat; } .zotero-tb-button:-moz-window-inactive > .toolbarbutton-icon { background: url("chrome://zotero/skin/mac/menubutton-start-inactive-window@2x.png") left center/auto 24px no-repeat; } diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css index 94c8cb07c..f4bff14f3 100644 --- a/chrome/content/zotero-platform/unix/overlay.css +++ b/chrome/content/zotero-platform/unix/overlay.css @@ -173,7 +173,7 @@ toolbar:not([id="nav-bar"]) #zotero-toolbar-buttons separator { } -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #zotero-pane .toolbarbutton-icon { width: 16px; } diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css index ef62e1829..0aa17feb8 100644 --- a/chrome/content/zotero-platform/win/overlay.css +++ b/chrome/content/zotero-platform/win/overlay.css @@ -191,7 +191,7 @@ toolbar:not([id="nav-bar"]) #zotero-toolbar-buttons separator { /* End toolbar buttons */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #zotero-toolbar .toolbarbutton-icon { width: 16px; } diff --git a/chrome/skin/default/zotero/bindings/attachmentbox.css b/chrome/skin/default/zotero/bindings/attachmentbox.css index 317358414..c4613ae93 100644 --- a/chrome/skin/default/zotero/bindings/attachmentbox.css +++ b/chrome/skin/default/zotero/bindings/attachmentbox.css @@ -24,7 +24,7 @@ list-style-image: url(chrome://zotero/skin/arrow_refresh.png); } -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #reindex { list-style-image: url(chrome://zotero/skin/arrow_refresh@2x.png); width: 20px; diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css index 908c28501..bbab2dc41 100644 --- a/chrome/skin/default/zotero/bindings/tagselector.css +++ b/chrome/skin/default/zotero/bindings/tagselector.css @@ -96,6 +96,6 @@ toolbarbutton.zotero-clicky /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #view-settings-menu { list-style-image: url(chrome://zotero/skin/tag-selector-menu@2x.png); } } diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css index cca0feec3..01c474e97 100644 --- a/chrome/skin/default/zotero/overlay.css +++ b/chrome/skin/default/zotero/overlay.css @@ -70,7 +70,7 @@ width: 12px; } -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { .tree-columnpicker-icon { list-style-image: url(chrome://zotero/skin/firefox/columnpicker@2x.gif); width: 14px; @@ -763,7 +763,7 @@ /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #zotero-items-column-hasAttachment { list-style-image: url(chrome://zotero/skin/attach-small@2x.png); } #zotero-items-column-numNotes { list-style-image: url(chrome://zotero/skin/treeitem-note-small@2x.png); } .toolbarbutton-menu-dropmarker { list-style-image: url('chrome://zotero/skin/searchbar-dropmarker@2x.png'); } diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css index b14a97130..ecf2e0e6a 100644 --- a/chrome/skin/default/zotero/zotero.css +++ b/chrome/skin/default/zotero/zotero.css @@ -35,7 +35,7 @@ list-style-image: url("chrome://zotero-platform/content/zotero-z-16px-australis.png"); } -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #zotero-toolbar-main-button, #zotero-toolbar-main-button-single { list-style-image: url("chrome://zotero-platform/content/zotero-z-32px-australis.png"); @@ -465,7 +465,7 @@ label.zotero-text-link { /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ -@media (min-resolution: 1.5dppx) { +@media (min-resolution: 1.25dppx) { #zotero-toolbar-save-button,#zotero-toolbar-save-button-single { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); } .zotero-clicky-minus { background: url(chrome://zotero/skin/minus@2x.png) center/auto 18px no-repeat !important; } .zotero-clicky-plus { background: url(chrome://zotero/skin/plus@2x.png) center/auto 18px no-repeat !important; }