mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix main toolbar icons in 2x mode on Win/Linux

Browse source
This commit is contained in:
Dan Stillman 2015-04-07 03:03:52 -04:00
parent adadc9e03a
commit 61e11f9afa
3 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero-platform/mac/overlay.css
View file

@ -179,7 +179,7 @@
background-size: 14px;
}
@media (min-resolution: 2dppx) {
@media (min-resolution: 1.5dppx) {
#zotero-pane-stack[oldsearchfield] textbox[type=search] > .textbox-input-box {
background: url("chrome://zotero/skin/mac/moz/Search@2x.png") left no-repeat;
background-size: 14px;

37
chrome/content/zotero-platform/unix/overlay.css
View file

@ -1,12 +1,21 @@
/*
/*
As of Fx36, the built-in styles don't properly handle a menu-button within combined buttons.
*/
#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon,
#zotero-toolbar-save-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 32px;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon,
#zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 28px;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] {
margin-right: -1px;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 28px !important;
margin-left: 2px;
margin-right: -3px;
padding-left: 5px !important;
@ -26,16 +35,6 @@
padding-right: 6px !important;
}
#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
margin-top: 2px;
margin-bottom: 2px;
}
#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker .dropmarker-icon {
padding-left: 14px !important;
padding-right: 3px !important;
}
#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
margin-top: 6px;
margin-bottom: 6px;
@ -47,6 +46,16 @@
margin-bottom: 0;
}
#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker .dropmarker-icon {
padding-left: 14px !important;
padding-right: 3px !important;
}
#zotero-toolbar-save-button-single[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
margin-top: 3px;
margin-bottom: 3px;
}
#zotero-toolbar-buttons[cui-areatype="toolbar"] > separator {
/* Copied from .toolbarbutton-menubutton-dropmarker::before */
display: -moz-box;
@ -86,10 +95,6 @@
box-shadow: var(--toolbarbutton-active-boxshadow);
transition-duration: 10ms;
}
#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 32px;
}
/* End toolbar buttons */

20
chrome/content/zotero-platform/win/overlay.css
View file

@ -1,12 +1,24 @@
/*
/*
As of Fx36, the built-in styles don't properly handle a menu-button within combined buttons.
*/
#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 32px;
}
#zotero-toolbar-save-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 30px;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon,
#zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 28px;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] {
margin-right: -1px !important;
}
#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 28px;
margin-left: 2px;
margin-right: -1px;
padding-left: 5px !important;
@ -94,10 +106,6 @@
#zotero-toolbar-save-button[cui-areatype="toolbar"] > menupopup {
margin-top: -5px;
}
#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
width: 32px;
}
/* End toolbar buttons */
@media (min-resolution: 1.5dppx) {