From ba0475810c416c12fa5acc3ae92153fd13d0ccf0 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Fri, 15 Dec 2023 15:19:22 -0500 Subject: [PATCH] Scaffold: Implement new toolbar New icons and new scaffold.scss go into chrome://zotero/skin. The separate root for Scaffold is mostly a historical relic, and adding special cases to build scripts, SCSS mixins, and so on would just make things complicated. --- chrome/content/scaffold/scaffold.js | 7 - chrome/content/scaffold/scaffold.xhtml | 4 +- chrome/skin/default/scaffold/add.png | Bin 1506 -> 0 bytes chrome/skin/default/scaffold/copy.png | Bin 415 -> 0 bytes chrome/skin/default/scaffold/detectWeb.png | Bin 1247 -> 0 bytes chrome/skin/default/scaffold/doWeb.png | Bin 1209 -> 0 bytes chrome/skin/default/scaffold/fields.png | Bin 797 -> 0 bytes chrome/skin/default/scaffold/load.png | Bin 1128 -> 0 bytes chrome/skin/default/scaffold/new.png | Bin 1532 -> 0 bytes chrome/skin/default/scaffold/save.png | Bin 1312 -> 0 bytes chrome/skin/default/scaffold/saveToZotero.png | Bin 3041 -> 0 bytes .../default/scaffold/setTranslatorsDir.png | Bin 1251 -> 0 bytes .../zotero/20/universal/folder-open.svg | 3 + .../skin/default/zotero/20/universal/plus.svg | 3 + .../zotero/20/universal/run-detect.svg | 8 ++ .../default/zotero/20/universal/run-do.svg | 3 + .../zotero/20/universal/save-to-zotero.svg | 3 + .../skin/default/zotero/20/universal/save.svg | 3 + .../scaffold.css => scss/scaffold.scss | 123 ++++++++---------- 19 files changed, 81 insertions(+), 76 deletions(-) delete mode 100644 chrome/skin/default/scaffold/add.png delete mode 100644 chrome/skin/default/scaffold/copy.png delete mode 100644 chrome/skin/default/scaffold/detectWeb.png delete mode 100644 chrome/skin/default/scaffold/doWeb.png delete mode 100644 chrome/skin/default/scaffold/fields.png delete mode 100644 chrome/skin/default/scaffold/load.png delete mode 100644 chrome/skin/default/scaffold/new.png delete mode 100644 chrome/skin/default/scaffold/save.png delete mode 100644 chrome/skin/default/scaffold/saveToZotero.png delete mode 100644 chrome/skin/default/scaffold/setTranslatorsDir.png create mode 100644 chrome/skin/default/zotero/20/universal/folder-open.svg create mode 100644 chrome/skin/default/zotero/20/universal/plus.svg create mode 100644 chrome/skin/default/zotero/20/universal/run-detect.svg create mode 100644 chrome/skin/default/zotero/20/universal/run-do.svg create mode 100644 chrome/skin/default/zotero/20/universal/save-to-zotero.svg create mode 100644 chrome/skin/default/zotero/20/universal/save.svg rename chrome/skin/default/scaffold/scaffold.css => scss/scaffold.scss (53%) diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js index 38f6228b32..ca1887f5f3 100644 --- a/chrome/content/scaffold/scaffold.js +++ b/chrome/content/scaffold/scaffold.js @@ -84,13 +84,6 @@ var Scaffold = new function () { this.onLoad = async function (e) { if (e.target !== document) return; _document = document; - - if (!Zotero.isMac) { - // Hack to fix Windows/Linux toolbar - let toolbar = document.getElementById('zotero-toolbar'); - toolbar.className = 'toolbar-scaffold-small'; - } - _browser = document.getElementById('browser'); window.messageManager.addMessageListener('Scaffold:Load', ({ data }) => { diff --git a/chrome/content/scaffold/scaffold.xhtml b/chrome/content/scaffold/scaffold.xhtml index e83d4f4e8a..e27796cb12 100644 --- a/chrome/content/scaffold/scaffold.xhtml +++ b/chrome/content/scaffold/scaffold.xhtml @@ -24,11 +24,11 @@ ***** END LICENSE BLOCK ***** --> - + - + %globalDTD; diff --git a/chrome/skin/default/scaffold/add.png b/chrome/skin/default/scaffold/add.png deleted file mode 100644 index 6813812f30c51c4f9b72e1c02936e6ba8ff1f3ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmV<81s(c{P)=PLkn0~ED<`wfKU*sZBf$;qq|KL6-!&=&1NrF_rl%mURb@T(L_y6 z%x<>b3*&_sW@%QJrJK?;rrRId%J!E^Ed!O(v;#v6BW0Lj`03319Q6&^Snm#ZO>>KUu(*<7>R4WRED;iz1xqZdBzq zz~@&6$O-H6PFwGfhL<8!vHUBA6JxMTq>M;kW@*-D`^ z&t8D1inpN3^N^M-6bK3GRToG?AP`BQXY?EnTxv%sItB`(O5yqczSQ4=BuGn6{?G;? z+bDEa=QQFE)$gD>uMq-;Yg1RyHP(s!!)<5_w4(i++CTg+bcK!}5WRu~1=R)hc=?gn zP+3p|5x79Mt=qlou|+x1e7Ld7NMjcjbD9c%g^eZKKoY^}Yv`Fchsdo-C@LhF07#IW zU!m75TQ;iPt5KL$1SJX`{x%%Hd>A5_FqnAw)bFnhSOu6HuCw7J71z|b*J4}Q?;s+$ z5bnl6#E*m|Qj*go=zfE?fr!`vZ?_~m^qu&3RFk(nV3 zMEjDGzumYSW^C_z(IiT*xEi?(PsVcOI|}inZzKM3x)mT_2k^1QfoBgjHi%+{+n$fw zWse|%I6l95<_B&69xUVpKnnch=aCSF+LAitX6AwdU(H)9>n#E(>S+q#bJy$62*v`b z8_p`=yE5&k<1viJf|{eUs0t#4O5o`v0=Q0u@a9%SC>V-eOPRR^W@kuqVQe}GfnZgk z7t{ib^_CtGK{18M%gBe27@rMUGEaqfAN>Gk{OQQAZwrsiPUzL0?SUvQusE3mD=0vg zJx6CZm6)<*zDQVHm`TiNSFl@5Nyr`PPIw#zP?CT@(61wilY1=!4sP!45kdd>^jA0; zJORLf&r@Tub%D%+B;+7a>hS^waq7|;grk!X1^@7$hrh7S0s}NYQm-m8+W#}K4-e+o zq0mu;@|+3`g#CAtlPNP_*q7v%!IQNdGjlUIeEtYT5fpC!!2`*m7yAB9!Rd+E1U~A1 zUq|6}SEJNbZpm3!3i9Hdl_+tS=~?pkLwhh8je^3iz^;)FivY6=am5x2NBc+n(Ba<; zfuJ(47OR)9(XS>+Q(4I~Y?-LcuS02G1%!eFr#{7(LxZ4VkhE?BiOwWeP?tAKzJYZH>zPGO$rKq`>=eO%qbiQdm} z?80Z5ip4NbI4YUW9OFxZqn+g^D5{JlP&NGhOpvxJiU2 zL+}UuxOlY}k=WEi!<{8;TZeWH4gRc)N!`w}EkeFQfj9X@3mnsD+VzwXD0IKQF}?#yoDbw1m|kBIzc4M}7c*~*T>h&)7i~e|>gnp|vd$@?2>_}$#qIzA diff --git a/chrome/skin/default/scaffold/detectWeb.png b/chrome/skin/default/scaffold/detectWeb.png deleted file mode 100644 index 9d8b23d95be90de10b6062751d64983ada98a2bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1247 zcmV<51R(o~P)%R<~#sxHKh;15_~+S2Nj7K+e~w79Un2E++vif`7H>#Swx$CJ_hn55&laZHvq`1$dJu(rG zI;2w`?MauY=O9Ei5cyJ#iRlU@zlJ12vky9_R=+Vg=!C5RL~eH^HxxfK({3bIcSq@I z_ZBdvIf;ke@Rq|e36Gni>qPHkheh3PgP3WZ|7Ol#v&hjhD#0W<#M;sSzD;%2J$CuB*!(forq(lHT456Lh=T-SO-+dd1fhd~M9gdSh*d2EnBlB+GTAT1xf)k< zb0FwSdPLks>S4YSbwuWl&eH5lf{QG4jpe9;N{1iz(TzxiAxhDa>W4072PS1 zj<`qEa~8fw)OA>v^hl>XTnBFC%Ul@Cq0m@y`K$JbKYl3l`j%uf0C)Twe)8@3y9RGd z;-QsotWKxuQMXk)0uzi*%y91a92Odn#z%>rd5>zX#YOi?N382;`ERlkT#Cs6F3 z5Q`2ZA07K+r(}CWX>DWpSQtcZ8c@8-bb00Ym#Oa3c{Xf$mbT6w%7r{5r@p4*&mxg^ zJF7bfhlZBpo$G^UGbL^64pkaeU z!_`=t0Ze;MVNqstGJO_S+?FQhC9#u3TO*l)-q^n`{J%A8e*u&tJ7h-Awb}px002ov JPDHLkV1oYWTfhJS diff --git a/chrome/skin/default/scaffold/doWeb.png b/chrome/skin/default/scaffold/doWeb.png deleted file mode 100644 index 20489a3644cbf07bad593065729effe5fd083f72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1209 zcmV;q1V;ObP)Wgerfa}F++0_S>A(a=W7QT3V5xOw_7um@_ zkaRO&YWURjf9F@DY8*&kJlX~9L!zN&&)VTEhZi#s$UeFN(qrqmeXoCbVK(euYaDQV zlMF6qXlU*XoGeXKeEMtIRw1ir-z6yTyRi=3O^5LprpP=T0c#6Z`lRE%OLsz@4s!sM zMBr}Nf^i!G;pfIyhL<-d(vG|7AS&g_O#FuY0#@eK?qgSnSAy3FNMAhKh1e&FhUNr9 z$d*ukyav9sSujovx3vdZkx38Z7v_-V%iYJWe6CDdAS5MZ1*9egDlK@`hc8rODgq^<|Vm(W#_u}0+kyaL_ zM_HI2MQ}6khbMkj0qJu`yO0Ue-`p9%OHlYFA6CYLvVB+_;_c}heglO6RK3;SyrTH=ZnLoiUf7~QP zq^%bd*+l04&lGb11Xt4Xh9!k`$Dm>51*Z}pUH=-&jmY@sgs?bXGhTEH0&MP12wX(s z2XGo%$xdE)Zn#hi$Mh%qQn!~mkRIu|f!G(__y*DTx0V98G+?TFea%3s9861se6o{Q z$WM)yf3`!!vnLbp-pyAoftNmaxCmhwoXaOm&syKy@V zUe17$Yn$iK;7G*U-lQ~@!j0|3Z9N2zM|Scu`KeJPi^LG|xf;u>EA)+MrMmai!FL?r zj=0fn#J3&B7H4o`yRfAka}P!+%}*jJFKH>|^(y>@WQB5k`-KEeZTm5iIF1*mm`yV` zF@pRBEJ|VMPaMC#qUA3v;O`&0dnJ0k=vKVgR%Au)$u;Jmq=Mi{L$uVl{DlPwGl)b} z`+jVxKqh^jLgqd|78pnzPlcv@T?7PouU;><4dF3!?|b}079eHOvc~eC2#^>AFm8<5 z@gI>bfy|I?nR#x@tE=u)P+t49740<(40QBedm+oKtF8kQgB9?Xw!FGR|ClV+;@St( zi6PrOdt^P~P{#pDgNQ8BK*#a*v3$(}#!h$l%Bs!E9$N3aUXuXVv9I`zvqxSw<@M@c X!%1oE^w*e(00000NkvXXu0mjf*$+fS diff --git a/chrome/skin/default/scaffold/fields.png b/chrome/skin/default/scaffold/fields.png deleted file mode 100644 index e2367c7111e8e328e3ad78b67314db7a446b9c1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 797 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

mdcM|Nr(2`(59T zE4Ke!fLP8_As0}|0#fFX$|sgFKP)M)p+ zz{{VXo1Z}PIKlhVjzU5Kt|y>$29FWy7y%j|!06fv$Uz3&_T|>cFHK3{l`qbJD&(sP zC~SY}0X#G(gF8X3DX6!s;fW?ZQTI`*`M6c}F*4@j?A02^E1n@I*BtRz#0YE}xYAe8 zyVpPzpI=KVLz)=7E%fBqqVlH&=lug2Yn`^4fQ;EVxk>1Og~! z41l8)6x#Eo)3!uHA>FcE3Mgch&9Pbc+|pTk-LAp&5RsKmoMx~TBou+gbF-*>#MP3( z3v4<;Xpjuk?hDWefO?ZCxq`7WalOLu#S^nBTZ0w@Ad=En#KumlA1X-C_H z%Z{QWCe>P3A5m@6GzmcpPF*PJxgUt0iwI)`9AZ95%*rM7-1TSzv0I?H&yWqo5YUGe zH2nZKD;@@ZxB#QT;TQo5`$>cZ8UZ5#89zBYQZZR6jevwu5Cj1>?LCR#&fNkjH-+Ao zI02#`B(kYCH{YL5YWpBM)>()Ulu-5($Zv$+lLy~fbt#EBgMI+IlH2Uf-YODEDJbi+ z-&>#k9H{|{$hU8==tl$&;>dzP#t`tOGxr*yF35Zc3no5EIl~$lqYoGju<%_hmYo9La`B%rrQLQ$yarJ$;9rhm{1IduYR7L23 zumr?pK($Gbk=`a@0M83rCYTN+O;>Qo<~_gX;sl69Q~}X0Th&dsqW!gMSraIi+bc^G z6D^OJlLFTj2n99sKF`pmruQze&)F_8IUjg!2@2T+ro;O8ega@+H^AWEAEJ=XqA!y{ zK9kkHYQsgX(Lkl?V$H)_?Q>$uJ0P_tXD(NJ=wqAnUZH~{QUjzq0`k%QKVH?$mOpY2 zZii$#r^igTpotWVMLo~uGstB!Ed{cn0!+0nXxMe>Y#&I5`#22L`yfY4H6ObVjo{5s z&S2m7BRF(o6i0?{VE9rQ=SQm;9d}W2{a6?DfLIE`8+YBurxzytUxacTm z%qJ6Yl)_y?=bzJcA05lVOFb*(G6u4YltpAv5U{{NiiFHc5~*w|)u#XlGs9&?wdp@I WA+leU#^VhD0000YD~a3PB;K?49dAy)Fpq6;VxAuEi{#|o{XYY435SsF$_A!`r;(;7;4 zJ_@np@aT|zaC0~kiU&a;5FC#dge4K|KhY&4YiNi-z{MgEQBhIwC^I;R7mPqzSy>^F zXapJ!lOSOHXtsbNgt7U%*C+XF9s-?D*P^r-0$9kOtM$kV> zZ2l)(5`ze727!Vj5uc;cg^YipNi+XSqf!5M#f{*Ft$CtR5%e%Ri_RACB|Ow;qx1O^8XozH zvN5(9PyR;+Z}FGL#^7dxD~};@N|DxuM|~357~72Z{+z(Z;0A)U_1L2fAw7&tU`QIe z=E6);)n^l%iFTYY4$qxSq0*&=tx-0FHlx>My#GyRLt+DwM#b_Y0z>Ik!G_h6tl8ST zZ%YYAYzX5JpGD&&ZvxhtLt_L*6DR^Y9*sme$53-I)s?PE#dptxf>Cm$T);_A8puI>zj5hD%rJokc9cy7XS~kF@3)W z0Fd`OOgQL4R!sZa_pD!!=Ep_6c#_|(X{MNj+UDbAu=R4FQCjF%F<=7Y8;^L<^TgpS z1o6fd=m#i?rJFCZW2w7=4-E_NRj8YWn#30ev|jUQPkz)%L-+C+>MwTmD4*8@KY==8nbW+b_x8>X@-RHmi*;l>kVm5If(3-RW+bEC)X zaqAN~@2~us4kYHG%E!sH$o$=_In4IZg4}l%L9Z+x^)v^SM>%K1t5|P>(D>>*g65%l zcjeevj93r>nr%+-uKo2X*l=fQ_ z01v)@#8l+XdQarpsydk(W?&f0bu6z;$h~->s6M4TDAeZy#9-oR(-*Kf4&5RcLuxAy zmj@MVr{*O%g$20H{mgUGu64Um!AwtW*BZ}nNQPvmXNH67%m@JAABm<8dD@q(>x=?? zG)@=zq257j%&F(CZ5&ZL8lCBtgYQSKXWGTlsp3Ut7%;4a&>4KG%!r6|+|oD_K5G88 zzSd8J?-{V@gA93MKNEReZph~9pDVw++kx_K{YFWq87kztcmgqC;H{#TGUp15n?FQO ztiZSCowl02The3WoSvX~cEswzF(L#iZt=QaP5}_Ih-H2TT{r&; z5@>>V*lG+sxBGsRmFEHTz1k@k7QGD4Qs@v@>f9V+T&;Q!JUJRCQyK9BWV1RRMb6gWGt~bG~c z()P3|#wc%vq0Or9W!0Ew5an*`hv!rj1|lay=!dkUw?DkP|IBif31D~MUdx=Cj2cX( z$(E2WCak(OuO(Hu|6}jFk{LVDcStR&g%9j;Ji?x1odQbotY#F7f^AHkDvBPy#gzkEc0g_Vs#WO}<+dx;K36sP?GU?I)T3H%|d1m?_-_5x3TzxinvK z_eA}+n@zggo}Boh?UasDV!)5uCvpIFoBCM_MxoyHc*pm(6{#sYZiX$4Ldo1#qolyNHDfzT+L{Y zpz!kj#?ZEz{)G5`Icxvu{j(;9Bl}d0?}6jFVF^p2v!NX%JjNicz#aXJc|@+#;dbWI zK?q7A`?jW4MQrX<(Vyof5)6CK!8@a-*+DvuJ9*r68{AqgP}yShX^0*Z!y`1Ml6V{inp|idVF#aY@a(yD)jDSG4v{ zin}eGm)nbc;R@VaZt`8TeS_Oi!v-SdbTIluuiJ;!I$8bD7m-tLs@d>uSEt{ z7;9ME?N?$*#dP`fFgniPX64c1p5}*?VU@lKfw}7!as%%AmDR;oGO3Vga9Gg}uK?;a zrQ58r>6>ER*PPDZ7KjjW`fEfP~K*Ehz##_7~8e`(EF)<;UXkv^B z7v8BiTo45zN(9Vsu)l1;{y%k;xE3A*?YF)PedI zSes)&0hlnN<6onsOomG3OsyL=OE!D}DApgjXqralbZDyQ6psd5P|}8!DH9qt#}u0N zaVb5H20-SR(2bgz&d(7R4WVgdvM_Qq;9=G`glk0;A>T+6?m!c;tac|d5yL;$P3xC? z94~)(ZC=Y7fi!2F0_g@&>RFLCp;Jh)kcX(hpCvW>sNA{_i;x8GT?IXkN=8N1=42MQ z?9Pu0j3C`sJ*(weU9eZ~z`1&F&W(_SMt>kWbDOeNuTs9g8GUYm^6E1DLoLX7jQ>?_ zBM}XNP{@R~vFI(x7|1>Yr7QQ~sM?)(Tf$?f2@U^P?qMf$6CHVQ8S|mpS5dL4k)>N|nCiSp;O+yg zmIzHJTE5CMpz_~=qNiNW528o4kTu;f=U>n(is)cT1Te3lJJ`g!e?&$LZD|b*@-s^+&v8vQ)rlyMr2wpqo{Ns z=Z(m$qXZ|e6ZZ8k52|KAtvg!^y)iUF@J zO&TEc8!8PjQjrmaLbHJ4aVUsVy0P;>o)c( z8~i^`IF#vNA{@@*02F_UWz2y0w_V5EKgp);Z?L{`H&@P`KZIr@CV)JneOPt zRc)iBDvpu{7|;z9h5kPXvlu+N`96Zxleb6dD5gID(3WSmUrE>Y5qs?&7}p zXB?#$hzG+|STyWf0u&2rLMU-O(}4x_&50T%G}yoUAj?YxT8R^3FGsgI85-)rH`0mQ zX8-=RPkP_sDWtK0Jolq03A4kk`2CYm;zl^ixi>M4ciuvilfYf1ru1S-o)e?Ruw!0SAt{sIApl^6uzhNA!g N002ovPDHLkV1kl~NxJ|5 diff --git a/chrome/skin/default/zotero/20/universal/folder-open.svg b/chrome/skin/default/zotero/20/universal/folder-open.svg new file mode 100644 index 0000000000..3f7612d009 --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/folder-open.svg @@ -0,0 +1,3 @@ + + + diff --git a/chrome/skin/default/zotero/20/universal/plus.svg b/chrome/skin/default/zotero/20/universal/plus.svg new file mode 100644 index 0000000000..f65eb1506d --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/plus.svg @@ -0,0 +1,3 @@ + + + diff --git a/chrome/skin/default/zotero/20/universal/run-detect.svg b/chrome/skin/default/zotero/20/universal/run-detect.svg new file mode 100644 index 0000000000..a87f22fed3 --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/run-detect.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/chrome/skin/default/zotero/20/universal/run-do.svg b/chrome/skin/default/zotero/20/universal/run-do.svg new file mode 100644 index 0000000000..58fbf9ae19 --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/run-do.svg @@ -0,0 +1,3 @@ + + + diff --git a/chrome/skin/default/zotero/20/universal/save-to-zotero.svg b/chrome/skin/default/zotero/20/universal/save-to-zotero.svg new file mode 100644 index 0000000000..c2754bf0fa --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/save-to-zotero.svg @@ -0,0 +1,3 @@ + + + diff --git a/chrome/skin/default/zotero/20/universal/save.svg b/chrome/skin/default/zotero/20/universal/save.svg new file mode 100644 index 0000000000..e22f12b90b --- /dev/null +++ b/chrome/skin/default/zotero/20/universal/save.svg @@ -0,0 +1,3 @@ + + + diff --git a/chrome/skin/default/scaffold/scaffold.css b/scss/scaffold.scss similarity index 53% rename from chrome/skin/default/scaffold/scaffold.css rename to scss/scaffold.scss index 582d85c085..1d958eecc4 100644 --- a/chrome/skin/default/scaffold/scaffold.css +++ b/scss/scaffold.scss @@ -1,53 +1,52 @@ -#tb-new { - list-style-image: url('chrome://scaffold/skin/new.png'); -} +@import "abstracts/variables"; +@import "abstracts/functions"; +@import "abstracts/mixins"; +@import "abstracts/placeholders"; +@import "abstracts/utilities"; +@import "abstracts/split-button"; +@import "abstracts/svgicon"; -#tb-load { - list-style-image: url('chrome://scaffold/skin/load.png'); -} +@import "themes/light"; +@import "themes/dark"; -#tb-save { - list-style-image: url('chrome://scaffold/skin/save.png'); -} +// Base +// -------------------------------------------------- -#tb-saveToZotero { - list-style-image: url('chrome://scaffold/skin/saveToZotero.png'); -} +@import "base/base"; -#tb-template { - list-style-image: url('chrome://scaffold/skin/add.png'); -} +$scaffold-toolbarbutton-icons: ( + load: 'folder-open', + save: 'save', + saveToZotero: 'save-to-zotero', + detect: 'run-detect', + do: 'run-do', + template: 'plus' +); -#tb-import { - list-style-image: url('chrome://scaffold/skin/import.png'); -} +@each $cls, $icon in $scaffold-toolbarbutton-icons { + #tb-#{$cls} { + @include svgicon-menu($icon, "universal", "20"); + } +}; -#tb-export { - list-style-image: url('chrome://scaffold/skin/export.png'); -} - -#tb-copy { - list-style-image: url('chrome://scaffold/skin/copy.png'); -} - -#tb-detect { - list-style-image: url('chrome://scaffold/skin/detectWeb.png'); -} - -#tb-do { - list-style-image: url('chrome://scaffold/skin/doWeb.png'); -} - -#tb-setTranslatorsDir { - list-style-image: url('chrome://scaffold/skin/setTranslatorsDir.png'); -} - -#tb-fields { - list-style-image: url('chrome://scaffold/skin/fields.png'); -} - -#tb-template { - list-style-image: url('chrome://scaffold/skin/add.png'); +#zotero-toolbar { + toolbarbutton { + width: 28px; + height: 28px; + padding: 0 4px; + margin: 0 4px; + + .toolbarbutton-menu-dropmarker { + margin-inline-start: 4px; + } + } + + toolbarseparator { + appearance: none; + width: 1px; + height: 20px; + background-color: var(--fill-quinary); + } } tab { @@ -98,19 +97,9 @@ richlistbox { } #zotero-toolbar { - border-top: .5px solid darkgray; margin-bottom: 3px; } -#zotero-toolbar.toolbar-scaffold-small { - -moz-appearance: none !important; - padding: 3px; -} - -#zotero-toolbar.toolbar-scaffold-small .toolbarbutton-icon { - max-width: 16px; -} - #zotero-toolbar toolbarseparator { height: 18px; } @@ -129,14 +118,14 @@ vbox > splitter { select[size][multiple], listheader, richlistbox { - appearance: none; - margin-inline: 0; - background-color: #fff; - border: 1px solid #ccc; + appearance: none; + margin-inline: 0; + background-color: #fff; + border: 1px solid #ccc; } listheader { - padding-bottom: 1px; + padding-bottom: 1px; } treecol { @@ -145,16 +134,16 @@ treecol { } listheader + richlistbox { - margin-top: 0; - border-top: none; + margin-top: 0; + border-top: none; } select[size][multiple] > option, treechildren::-moz-tree-row { - padding: 0.3em; - margin: 0; - border: none; - background-image: none; + padding: 0.3em; + margin: 0; + border: none; + background-image: none; } richlistitem hbox { @@ -162,10 +151,10 @@ richlistitem hbox { } richlistitem[selected] menulist:focus-visible { - outline-offset: -2px; + outline-offset: -2px; } -richlistbox[disabled], toolbarbutton[disabled] { +richlistbox[disabled] { opacity: 0.6; pointer-events: none; }