From 20b63f1fa7dfa590f824a77022f7ff0269e30f76 Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 13 Jan 2012 23:58:01 +0100 Subject: [PATCH 1/2] Merged and optimized icons --- static/img/etherpad_lite_icons.png | Bin 2307 -> 5686 bytes static/img/fileicons.gif | Bin 1649 -> 0 bytes static/img/nw-resize.png | Bin 452 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/img/fileicons.gif delete mode 100644 static/img/nw-resize.png diff --git a/static/img/etherpad_lite_icons.png b/static/img/etherpad_lite_icons.png index 606612313dd64b158a7ad0007a56271346aa53ac..b22da518cf974b2265ecab982299f3939f57f78f 100644 GIT binary patch literal 5686 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 diff --git a/static/img/fileicons.gif b/static/img/fileicons.gif deleted file mode 100644 index c03b6031a62780479212fe50240ccb60dd3750b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1649 zcmV-%29EhhNk%w1VG#hQ0LFg+N=i!c@$svxtN8f%?Ck87m6fH(lWA#bk>88L!^5H0 zkZhRMh{M*(%FAi5&)DhJ@UW|TdV1ENII*#@+}zw~iqb`iz>v zf~|G_{{L2K$m;6q^z-xg+Sq8atmy3bRMTo|S1^Qxgj#dVR;1GS>F8CtoVe@D)85Wm zebCj_)SjN7e3;j!+1Po*$&9wKinoi9rQ7nuzvO&%eWq>QR88e;V~mZB=jZ3( zdUlW1tH+_Iwc_h`Z02WOZJt~9_xfah(8$`t?eF;7-}3tU`uqI;&e72{G&SI;IqlGZ z`1A9#zpu-QhV7!9-oAgUgfr;PKU`c~`}_WqawOU~EzCkajOU@7!GiFCb+Eza-*Ii` zUQ=L%(ERu8XOqyCkY>5DU+(Pa!j(Fhl8RTV-r>@!$j8Tg#dN>dy29eFdU0Rt+`#nC z%lG;GPL;ljjgelWhk&eXK{ywRxouLVWc&O3Zf41egav$kkdcrRhI|8iewmsB2b6?;dmtO50RbO=Je`6I z3uLThWEB-+ryC%u3v)}mydy>gntpwM3rjF$H9s&lEiC~AA3VauORQgFH83qF8>PU* zWX2UgEk8yzCj+(t(-lkPMn)$_NheC`8|_#XEkWc#NIdKrKyaFv4n}?yF*hQhl6wQD z8EJ^5V#OpL9zL9Q;)Dl}9zurPLlV<4L4AU$)O7NXrIo=3@EPPtlFdGR3NYHqv!~CW zK!f(Id9#lvLY6S8a!+>;I0au2I3<&N3@ivWv0xl~Y$RNSE3x{>nh$zS)1BHwXD)bm2 zg0HZG3l7wvut3L-V}cR$`e-8pg__bnhyZ~&?E!}_pdEsgf%-)g+#e|g10Z4jtpp%_0~V;#J)<<32?!eO@WKuh5MZH&gT(hj0X$HU zKmi3%AYuV8pyY=J5inr_00$Hh!2tl6kU#_~?qC8F8vvjI6A1_azy=AJprQbLxc&&h zl1$n-lS>0o5aR>_I1)ht0!&cA0fN*t!4(Ja!N&_o@^Qcw6ojYdnryD=h?sD~SwIJc zoVQd?bPmFY5);%|ihFqKNk9{XHc(0}8}M-y9|V+PMhOjcbBZQUx^#vWRzRxGGXhr1 zM*?ZM@InL-66Wa(9dtlJ6DE|(&XY=9;XY0?k_FFvJZIq}JgL zJwPyp4I%WP!wnY?D22|Mkn~UrP-Hud4Lxijhk?p12SyH3(5set^HOK;9{?A%oxg0i z-EZ2Gln13!F%|3-dkRklU%jZ&SBrfd50HQc6HqBYFbV#*smKZX!N%Z(8~zQ)DlN!P z<4iR0IOH1S(|F~mjqHL8nQP7l8$zq7iPYGRY$64t$G)8EVoO&xOlQMw)7ozL?)!JJ zColmJFT4N*5Nikk2O4P(AOH|?M4!U+)Mt?c8fc)s#`ZuIF2D@Z2_#_s6gj~0#|tR{ zA$*qKi+_Fj1N v0ZdU3Bme>lvQU7+4Wfq=KpzEOu){IBpb!E`00punN5K){iN9k+AOHY6T+#W% diff --git a/static/img/nw-resize.png b/static/img/nw-resize.png deleted file mode 100644 index b6c5e3956a9a5af065f612644cdfc61e5a9df466..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmV;#0XzPQP)ZUOIEANKpPhp z6X{o+SN%0{obm3Di*EoLfCeDZKc}SU1?WpDSOB!3b_n66a-sJts6L?50$>4J1;7Iw zjSZro01B7{_-O&qhBn~nZWMr>AHlqUo~;0upe;DN(E#lH80I``X2`o~J%I zKg$J?%meJ)v-47c9pr+j%Y-r>SOm5VttB8zUZ>YqX3XEd1)h(g3W5T2K%i(p4Hwj8 z%t;=jI*2anTh-olF<}jI0sI6a?tQekVfJ|!vH@s_4n*gFC|6Vp1MI-OcQI*Y1)xHK zN=d7bZP#TM0CX!l6mW@G(-eS?fS&Ds)db5J5CFPn`z|J^MfIB$^%VV=&fpeEk&G#7 usj-s(wJ2L27+pWrx8uM4DsBK~R=xo&Yt|tOTFVUp0000 Date: Fri, 13 Jan 2012 23:58:47 +0100 Subject: [PATCH 2/2] Changed position values --- static/css/pad.css | 29 +++++++++++++++-------------- static/pad.html | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index 933b7af1..5d95c9f4 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -970,14 +970,15 @@ position: relative; } .ui-resizable-nw { - background-image: url("../img/nw-resize.png"); + background-image: url("../../static/img/etherpad_lite_icons.png"); + background-position: 0 -416px; background-repeat: no-repeat; background-size: 100% auto; cursor: nw-resize; - height: 22px; - left: 0; - top: 0; - width: 22px; + height: 17px; + left: 3px; + top: 3px; + width: 17px; } .ui-resizable-ne @@ -1022,10 +1023,10 @@ position: relative; } .exporttype{ - line-height:25px; + line-height:20px; background-repeat:no-repeat; padding-left:25px; - background-image: url("../img/fileicons.gif"); + background-image: url("../../static/img/etherpad_lite_icons.png"); color:#fff; text-decoration:none; } @@ -1045,31 +1046,31 @@ position: relative; } #exporthtml{ - background-position: 2px -25px; + background-position: 0px -299px; } #exportplain{ - background-position: 2px -121px; + background-position: 0px -395px; } #exportword{ - background-position: 2px -0px; + background-position: 0px -275px; } #exportpdf{ - background-position: 2px -97px; + background-position: 0px -371px; } #exportopen{ - background-position: 2px -74px; + background-position: 0px -347px; } #exportwordle{ - background-position: 2px -49px; + background-position: 0px -323px; } #exportdokuwiki{ - background-position: 2px -144px; + background-position: 0px -459px; } #export a{ diff --git a/static/pad.html b/static/pad.html index 4324544e..c6fd3e77 100644 --- a/static/pad.html +++ b/static/pad.html @@ -100,7 +100,7 @@
  • -
    +
    1