Skip to content

Commit

Permalink
Use 1.25dppx for HiDPI icon threshold
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dstillman committed Mar 19, 2018
1 parent a12b997 commit d44cc05
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion chrome/content/zotero-platform/mac/itembox.css
Expand Up @@ -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'); }
}
2 changes: 1 addition & 1 deletion chrome/content/zotero-platform/mac/overlay.css
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion chrome/content/zotero-platform/unix/overlay.css
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/content/zotero-platform/win/overlay.css
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/skin/default/zotero/bindings/attachmentbox.css
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion chrome/skin/default/zotero/bindings/tagselector.css
Expand Up @@ -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); }
}
4 changes: 2 additions & 2 deletions chrome/skin/default/zotero/overlay.css
Expand Up @@ -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;
Expand Down Expand Up @@ -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'); }
Expand Down
4 changes: 2 additions & 2 deletions chrome/skin/default/zotero/zotero.css
Expand Up @@ -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");
Expand Down Expand Up @@ -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; }
Expand Down

0 comments on commit d44cc05

Please sign in to comment.