From 88f1636d0890f89edb6490d9357376ff88397df2 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 10 Feb 2016 03:20:55 -0500 Subject: [PATCH] Toolbar icon tweaks - Fix spacing on Windows and Linux in latest Firefox versions - Tweak icon colors on Windows and OS X - Adjust Z SVG to take up full height, so Z is a full 16px instead of 14px with slight anti-aliasing - Use generated PNGs instead of SVG for Z toolbar icons, to remove the need for complicated size rules - Add separate platform-specific .svg files that are used by a zotero-build script, make-z-icons, to generate the Z PNGs; the main SVG is still used directly in the menu panel and customization palette, with platform media queries to determine the coloring --- .../content/zotero-platform/mac/overlay.css | 10 +- .../mac/zotero-z-16px-australis.png | Bin 0 -> 712 bytes .../mac/zotero-z-32px-australis.png | Bin 0 -> 1287 bytes .../content/zotero-platform/unix/overlay.css | 21 +-- .../unix/zotero-z-16px-australis.png | Bin 0 -> 761 bytes .../unix/zotero-z-32px-australis.png | Bin 0 -> 1493 bytes .../content/zotero-platform/win/overlay.css | 29 +-- .../win/zotero-z-16px-australis.png | Bin 0 -> 773 bytes .../win/zotero-z-32px-australis.png | Bin 0 -> 1445 bytes .../zotero/zotero-z-32px-australis-mac.svg | 157 ++++++++++++++++ .../zotero/zotero-z-32px-australis-unix.svg | 157 ++++++++++++++++ .../zotero/zotero-z-32px-australis-win.svg | 159 ++++++++++++++++ .../zotero/zotero-z-32px-australis.svg | 171 +++++++++++++++--- chrome/skin/default/zotero/zotero.css | 19 +- 14 files changed, 638 insertions(+), 85 deletions(-) create mode 100644 chrome/content/zotero-platform/mac/zotero-z-16px-australis.png create mode 100644 chrome/content/zotero-platform/mac/zotero-z-32px-australis.png create mode 100644 chrome/content/zotero-platform/unix/zotero-z-16px-australis.png create mode 100644 chrome/content/zotero-platform/unix/zotero-z-32px-australis.png create mode 100644 chrome/content/zotero-platform/win/zotero-z-16px-australis.png create mode 100644 chrome/content/zotero-platform/win/zotero-z-32px-australis.png create mode 100644 chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg create mode 100644 chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg create mode 100644 chrome/skin/default/zotero/zotero-z-32px-australis-win.svg diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index 016661926..10bd317a4 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -2,14 +2,6 @@ As of Fx36, the built-in Mac styles don't properly handle a menu-button within a combined button, so we need this ungodly mess. */ -/* Necessary to keep 32px icons from being rendered at full size */ -#zotero-toolbar-main-button[cui-areatype="toolbar"] > .toolbarbutton-icon, -#zotero-toolbar-main-button-single[cui-areatype="toolbar"] > .toolbarbutton-icon, -#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -#zotero-toolbar-save-button-single[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - height: 16px; -} - #zotero-toolbar-buttons[cui-areatype="toolbar"] > separator, #zotero-toolbar-save-button[cui-areatype="toolbar"]:not(:hover) > .toolbarbutton-menubutton-dropmarker::before, #zotero-toolbar-buttons[cui-areatype="toolbar"]:hover > #zotero-toolbar-save-button { @@ -36,7 +28,7 @@ } #zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button { - min-width: 26px; + min-width: 27px; padding-left: 1px; padding-right: 1px; } diff --git a/chrome/content/zotero-platform/mac/zotero-z-16px-australis.png b/chrome/content/zotero-platform/mac/zotero-z-16px-australis.png new file mode 100644 index 0000000000000000000000000000000000000000..97e9279236a71d14ecd0deeea87a8ddf17e0fc14 GIT binary patch literal 712 zcmV;(0yq7MP)s2w)gMk6_UEeed@6R#jEatREn8n!HG-(>{PfB;7Ui#4M-G4 zN>Tx6Od=uz0A7!PYI4-O7qUR+!}0YDKkl1w@z6SUUX z*FTaR6_FH40pL2F&e+!0R^jsUGG}H~RfU1Q0Jr@UbV-Ksp6>MY^kJz~dR?p4mQ^(cK%8^knVFf- zo12@(TrT&WWV?R?{9T)JbaXVnx3{-luh(Cws-J*oXJ=3H`TV{;zlz8Y0IfS3kaXp8`SH%qPN~^!E&@oK znKm-BN2@w%WOfbB*w)Vc=ZZ85Dh_%4vx^)HX4m+e}Dgzh;#)2%q+LEvT{N)N7BUyLjW|h(9FW*z|1U+qNsLwc=%LA zZW0$Vp69u4w=4Z83qWEQ60NAJk?;EhB!>Xp^fYkJF^VEHvk3o%s`hf{96ird0O@`g uBIn$-=Xp?7*Y|;XVP;HLAlVcV0>B?}lP|FhA!w-p000074MO8to3L(LUE|9u}O}i_~ zhm&H`q)yVt<9UaLr|I}RErGkSrFZ9^^Uk|--W@?4Bn5y>OiWx3f*=qPg+mIGu3D|$ zy?OKI6ab0{AFP=~o+jyMv)Qcg`$v^hroGhTg>$ZMt-VDuEh2jW>TLu_S^z_tOeUz+ zYQx4D13(S|pY?jZp3P>501N?$NJbA-Nbb^z$Y461_MLMkUON;5#u)g%?*kYBumhk5 zfB=v@XCY~nQW66n1~>qSQc8?53VK>Oe`uZFFXFeXEs{MT zB!whJge2MNfj-ewy+-Nglq3NHaARX*zXw5Z%k#XH)>;FAbFOdU8#iu@mCNN!KN78x zd<`9d+S#*bzaV);L;{jl8gg_iDgg9_3m0CwcJ11Wj{@9AKtw{4J0$-CP$QWFVB(W# zBM=iai;IhIT)A@PwJ3_ZVUQ%PwY8)Jwh;gj0;tABHqq<@O$6eDH0REpJ9+*3^|zdJ zHi{ypRC`Z5=QuJlQk|Zj{wnS(Ci@_%Ktys6KrL|(wCy}T4!y9j@XpfG(z^hLlu|ZE zZ_Ve($VjzVEPk2G<$goMfFi^u)T#hP#KnJm>1ocKIWxPyzW$yu=1HYg8l7E}K@e=0 zN~QCYlas#!*h0ev>q!ES=xQ!16t=W@AU0IUP}8^Df; z)Vtk=eZdQb!rQlR-~KS2PCw<8ev{AVe*&-yV4dV05xLh2ejo)%>bbeOe7Riy*joDx zfUe-a@82&J3g71Q`5$BOH2@nic)hhY&_@B1dVYTX^_7*CPqfz0Dy0T`fbX3?efqnp zsi~_61qT4#3%pn?zPhrq@|iK_Xdm#}sZ*yePESw&0AN)_)&Sh;2M%;mAl~`QOG`_i zYOSABN)4b(w_9t&6DLkwnwgo|2Pe59BD?*-fet-DQkP1lmzI~8KleQEd8O1K0Mo(d zXpE`P%*=d0J3D&`4`sh2BD?6}CCO+iN>VQ@EF6nvAMXPm9Y22ja-mST2%rq0EFv2K zb^%14e7{rdOG;9a^mDn~Ri)Gm*4iQGob71v07pkhE92wie^jg0yPKPvTjg?jXKQOK z+}_@HQ53a-Z)|Kt%gf8}w-Rd`N(ToAkJM_lfga!hfJ&wEM5R(W=A7G$qNwJabDrlh zlgYH@hG7^5LGUL4pJbTygQl@uL zB3UKrI*sL;r0;p24#Tk55CSwNT>#KZDIJ4!O}5smR4SDsISAk$8drZaf%uNsA|lSY z&Xrn793%+ .toolbarbutton-menubutton-button { padding-left: 0; } @@ -78,7 +64,6 @@ toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator { width: 1px; height: 18px; -moz-margin-end: -1px; - background-image: var(--toolbarbutton-combined-backgroundimage); background-clip: padding-box; background-position: center; background-repeat: no-repeat; @@ -162,10 +147,6 @@ toolbar:not([id="nav-bar"]) #zotero-toolbar-buttons separator { @media (min-resolution: 1.5dppx) { - #zotero-toolbar .toolbarbutton-icon { - width: 16px; - } - #zotero-tb-sync > .toolbarbutton-icon { width: 20px; } diff --git a/chrome/content/zotero-platform/unix/zotero-z-16px-australis.png b/chrome/content/zotero-platform/unix/zotero-z-16px-australis.png new file mode 100644 index 0000000000000000000000000000000000000000..f41c74f530111f1720720e833d67407f04c349e2 GIT binary patch literal 761 zcmVJ$z<~0dmb0#ghceN&-3GV?m345;O@r+`L`F&NE^W`Y0!1mP|MKnO+vC?imm zRs+xgFqb9CJo9vXGCQ%H9RQ*co}CtgnVIDb3&ALNavlq(07=o$gw+v@keaUtj-P(gl)*Bm#&>M@Ow&x9+^3W&KDf=cJrG zm1THLGMxed97#$f_ay}YaX1`yKEHkY1ICqCin8E5T%}sjPit?z`4NEQvj&x<1i%2q zy}iBem-p^{SYPR0D{G2e-nCj$tGQ0dKLlLfJ7=R5s;b!O)H8RKv4oD6$J!{$cloZWDlEyfG*lb{0o(e0JTyrL?fZ9QoCWp zf(1&uZKYIz<4}m>#ADCA_wN0&m^b!}{Tw^OoP|A_H*>$=^Ev08cScYKNdX`S4<0%{ zJ~7r%RmBd4_uhXw|HZY>KK=A502C4SuGzlN8IsYR`|lc^+>!ppk{_fI5NPcZwu! zTqK!@NC!Z%!2rnsKsvH}xUp;3&@I*)E2`hw0=;KZxMFB{DFu)Ma3o!iLO%g3B6Smo zk+sGeW3AZ%15P{vA`HU_Kn*|(Kn7rg0U>FPLPS-JszAPb4UDP~R;*P85Rg=nwS!j; zly9o;K-Qauh$t}FSv%J0TZOVZvGpYo?>*@~9Xwg}jf#-+&sJq4*-w9i0Rr&5(&S%_ zB)k|!VQh?;uKUeTB^)3|zWn0yzA$YJ8Dnm$g#EXn2avt-+G}r<92b!W$v{M;98y&w z0L<*{?89?mZ~z2AqMyQ66#JVnC)pzTe*hWD7=UHB5E~4X#_T)qz4yd_{`+||s;89# z-g|oI=%vW|C*TGH0CE7=OCwjyYdzrs17#uYxpQwnbLp$A#~LF;0RSb~&A9BI-oJLc zb^YO=9r`1?*|5J4`UyCa9ROK*yHsXgmcyJmbLK?`(aX1vPNY^%plZ~p8DQ_cW3jw) z{TC1X_z%ry^AmIjkV9W(`UyZpeEHI?7w$7)Pn!<|7{iSVVUU7MmK_DoEOwW@erV)1hCFj*gDRQ5>r=R@De0<*`KJ z9P_N*I&}ZN?>_cu^PeOy1Na6&OGJwPUfA{^B57ZEVdi)oHeMea9T|&jwM5kfUF<#b zgmaFrv%LJkz0>bM)@=TRLlB$skD*s0q{< zS)EU%c%H4a4<5Mt&qt0N`CBPI58z5EUR0fbLjxqu>C>klr?I~o8=2Y@){~l54Xjb= zQZF<2j=3v3_f6mRm!n6IezaY2;08TF(wsbb@{ug#Z-<8W?5(A>niUOfujT~c%gj4j zc3}U$*<;6!od+-{BJ%(iwi4fzK#BdKLgU|!O^ol2YW12JV?}fjyLZf;%cu9>{=qMg zAOCAloa7Y|S>8&#l0b?5=WVCwM#sl)k85c?v}#2}Wfi-J^96m87t{Ope)#OuPk(?l z>wqYqvhi(~9lB8yXAQ-^D z<^TYp$*$cCOPvQhZFU$%+0>pNdN<`Nvo7-7eKU9Ie*hwqdH*~ZSj$DEmLy4N)L0Ut ztK)SYGy;K$<~9oAG&G5ek^;IZau%JO?YsdXC3&5suUg9u$;gNrsu5MGQty6HMV$Ar zLPNm7T7;X3ivYPs8pm-=vJPMc-ADhRf$|w|K$YG$xM@lv(Cw~XB!r@BtN{=LFzD;O z>Pg5Oso!J_p0(k&A26`C`+Xk{T#xbqxq-EO?UlfJ&z<;@;=QLQ;7s*mJFu3E2=k)7 v .toolbarbutton-menubutton-dropmarker .dropmarker-icon { @@ -46,13 +27,13 @@ toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-save-button > .too toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator { margin-top: 11px; margin-bottom: 11px; - -moz-margin-end: -3px; + -moz-margin-start: -1px !important; + -moz-margin-end: -3px !important; } toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator, toolbar[id="nav-bar"] #zotero-toolbar-buttons > #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker::before { width: 1px; - background-image: var(--toolbarbutton-combined-backgroundimage); } toolbar[id="nav-bar"] #zotero-toolbar-buttons > #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker::before { diff --git a/chrome/content/zotero-platform/win/zotero-z-16px-australis.png b/chrome/content/zotero-platform/win/zotero-z-16px-australis.png new file mode 100644 index 0000000000000000000000000000000000000000..33e095ed7e0dae80ec1abb2767eac143b0fc451b GIT binary patch literal 773 zcmV+g1N!`lP)a;IZ3K#6w`UEgpK1LJJ{ykd_u2a$5A@Eg*tm3neIx zhiJWoE^(7hHfF!?H{)S6!9il?mlQ6bA(FnOOzE7=Qx$A%s?|b+plF%@T(c&92R3Ru>2<&jd+%tisc94c^u&IB=~ltG~Xc_IQZC;%~2 zW(3Lb<}ajP?Cy5k8~=FkJXMIdl!;nOc|wY>fc}=(K8QLd^PdBR00000NkvXXu0mjf Daa?G7 literal 0 HcmV?d00001 diff --git a/chrome/content/zotero-platform/win/zotero-z-32px-australis.png b/chrome/content/zotero-platform/win/zotero-z-32px-australis.png new file mode 100644 index 0000000000000000000000000000000000000000..b62ed08e31676cf934f20c9b62aa90051ca75b83 GIT binary patch literal 1445 zcmV;W1zP%vP)lqS zR99C&BqG8iD$LBWSgbN0k2eEgBI0bH${8n_*{-dvO|9SjYy*)}g;V`k0-o3Z+mCmd zIZQ-p0A2wBX4XVh9*tI(MZy(P*7}hVAlLP(qtP-VDraWH%zjpd84x0p03upzi?vot z2t~k>!@vN0T0?7X0f-P$0-1Sd6JTZmKxu6Y!G;KeAeO!j$S?^uq_q~ztN@7I{U!3p zFBx$jKKTu~A)x=8KrxJhjV44!cLtaYFO1LvLY192zZ4K~ocmQ$@`w;pNh$L~R8WjD zH0`;v|Hh57mX}|Zb|kzY&IJURnE`mcy}hq1rB)JAxiQ8n5gGzOp6BV4Cr=)NRk6$t zg%$-qivSUM%$%&KsBnmAikTxpe*riV5i^tPx}lz)o_Ay8Q_EMat}Ut-2ft)0WtSuX zzy%No-~*Tl`m&Selb~cW8Sd`xK07**czi`oy)pt2f`I%CE*Q?8>k}OZ4ty1;%(+=U zmw-n^NdQv-WU$bJ)iX0qOiY9h9z1vD-G&IHltKt90B6HP1AX!Rd)mJ}di3zu z!6FTUBs7aakQ)7x`Qi&Zu67?g_9cK} zBKix!KgfjF&mBE4fh>4yYwL$;#=g3yr&f>@w$w@%W+21P?Y`uW=eGWQ;>6n*rIZdc z4+9tjkVIymaqb%>6HOMpt*z~J$~7J9Ha4%)QiUw7B|*$2h)gwn|8`%hdCSwko;r2v z3n7HV%)>-924J!ncu55UaMjk<_FgiX?p(Kd`zmQ!wvr@)*|IbH>bX{%D^^eY-`$S6lCo?+$ zVuA4}2|kwsvZJHp(BC5?hZ~xoDGBZj-fLRLrqOhS2u0nwKft8MTAmXkSYjMDxJg+-&}I*>+8paREepSmq;YWlJR)l z^*oPV*Ueu!kBp3DZMi9G%LBi*tg^C-BDNKRw3HyCVnGVqVZ8K8mn8UA{KMM_H&Ac#5Agdhm`WQ>x^rV#m7(N8S^ z2w~Vaz88%~mjNgXEV++-SB%WX#M0Up#Db&{RO(A1r6egqV1kr$k7E#%hZ$Rr%+XBG ztUCLUH5tLboH|dL=LSbi1O{mx&f4->6VKB4QQimV;*;M{+!ZfEfW^Qr$d+f{U@#Le zT@eN|K#Q~GLLnxE$n}IvDaIJ%InMp6Vx9j2$gDm~ry0ao00000NkvXXu0mjfc*BQ1 literal 0 HcmV?d00001 diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg new file mode 100644 index 000000000..1a0b8dbda --- /dev/null +++ b/chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg @@ -0,0 +1,157 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg new file mode 100644 index 000000000..f04382843 --- /dev/null +++ b/chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg @@ -0,0 +1,157 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-win.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-win.svg new file mode 100644 index 000000000..f18df739c --- /dev/null +++ b/chrome/skin/default/zotero/zotero-z-32px-australis-win.svg @@ -0,0 +1,159 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis.svg b/chrome/skin/default/zotero/zotero-z-32px-australis.svg index bd61c3756..8434687ce 100644 --- a/chrome/skin/default/zotero/zotero-z-32px-australis.svg +++ b/chrome/skin/default/zotero/zotero-z-32px-australis.svg @@ -1,8 +1,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css index 884aadd01..eb1b8d562 100644 --- a/chrome/skin/default/zotero/zotero.css +++ b/chrome/skin/default/zotero/zotero.css @@ -32,7 +32,14 @@ #zotero-toolbar-main-button, #zotero-toolbar-main-button-single { - list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); + list-style-image: url("chrome://zotero-platform/content/zotero-z-16px-australis.png"); +} + +@media (min-resolution: 1.5dppx) { + #zotero-toolbar-main-button, + #zotero-toolbar-main-button-single { + list-style-image: url("chrome://zotero-platform/content/zotero-z-32px-australis.png"); + } } #zotero-toolbar-save-button, @@ -40,6 +47,13 @@ list-style-image: url("chrome://zotero/skin/treeitem-webpage.png"); } +#zotero-toolbar-main-button[cui-areatype="menu-panel"], +#zotero-toolbar-main-button-single[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button, +toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button-single { + list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); +} + #zotero-toolbar-save-button[cui-areatype="menu-panel"], #zotero-toolbar-save-button-single[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button, @@ -48,9 +62,6 @@ toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button-single { } /* Show single icon for combo buttons in palette */ -toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button { - list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); -} toolbarpaletteitem[place="palette"] #zotero-toolbar-buttons separator, toolbarpaletteitem[place="palette"] #zotero-toolbar-buttons #zotero-toolbar-save-button { display:none;