From 16c9bf6130baed002cefee7f0dcf687188ad718d Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 18:52:17 +0100 Subject: [PATCH 01/10] removed old pad top image that is no logner used --- static/img/padtop5.gif | Bin 3872 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/img/padtop5.gif diff --git a/static/img/padtop5.gif b/static/img/padtop5.gif deleted file mode 100644 index e6e071d6ccec737b9688181f9523f6567908d697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3872 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 iozz*K)_I-SnVs4Zxt-kEo! Date: Sun, 31 Jul 2011 18:52:35 +0100 Subject: [PATCH 02/10] removed old background image --- static/img/padtopback2.gif | Bin 372 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/img/padtopback2.gif diff --git a/static/img/padtopback2.gif b/static/img/padtopback2.gif deleted file mode 100644 index db46567b9fb8557d3762d560ae36e9011b5f519a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL`eNk%w1VHf~70E8d_D`BwK*48UvurzMKHF3i&W3w-3w=-?NGHkstX}T<7 zu`+ACF>1RwbjK}Zv^aIhHgd!@aKbENvNv?c{{H?jXt*wBwl;FbH*?0=*w{30!7gRB z)z#J4*VoL<%=`QMEC2ui02lx`000H~;3JM?X^u^*u57DLa4gSsjNN#y@A&2az@YF4 zDH@N+q>;dEI-k&HWJ;}CuT+h8%k6r%gRpo^E{hN7w0g}>Bi``1d=6jO@A$m_&glF9 zfPsDqgoTEOh=mo4jE#9|8&-NU)&6g9sBUT*$DY!-o(fN}NcsqQ#3C SGiuz(v7^V2_(F;d0RTHFq|GM) From 3a4c0ea254d26cc011b916638b98034273d5b93c Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 18:53:03 +0100 Subject: [PATCH 03/10] Remvoed maximize button -- I never liked this.. --- static/img/maximize_maximized.png | Bin 604 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/img/maximize_maximized.png diff --git a/static/img/maximize_maximized.png b/static/img/maximize_maximized.png deleted file mode 100644 index d1ae8f87ea37063c4c903bfaf822d63b67927170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmV-i0;BzjP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#00007bV*G`2igh& z6%`b^|GD1)000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005ENklleG+Naxu2tt-%$c z{H+kG-_<#z6#-yAdm_)n515Ds=*z4X#b||TJ4o{OM@ZHT57Ty#Mk{32ieiC8X7yM` zAGI_2s?SrX+kZS}!*NUa{_|1*z(*3vu@H?`nEPCi`y4DSXJNELax6rWux7@?bleiY z9b8oUCL1qT`qPoT81QpuJWOAD Date: Sun, 31 Jul 2011 19:08:14 +0100 Subject: [PATCH 04/10] New icons file, updated timeslider and resize image --- static/img/etherpad_lite_icons.gif | Bin 0 -> 3018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/img/etherpad_lite_icons.gif diff --git a/static/img/etherpad_lite_icons.gif b/static/img/etherpad_lite_icons.gif new file mode 100644 index 0000000000000000000000000000000000000000..e18bf911169f8d22ee39e8d9e0f5405203742834 GIT binary patch literal 3018 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 Date: Sun, 31 Jul 2011 19:11:55 +0100 Subject: [PATCH 05/10] Add a new class for buttonicon which specifies the new backghround image, this is part of the single image thing Peter wants to reduce the number of images we need --- static/css/pad.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/css/pad.css b/static/css/pad.css index e5a98ad62..0b01ab6a2 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -1046,3 +1046,9 @@ padding: 10px; border-radius: 6px; opacity:.8; } + +.buttonicon{ +width:16px; +height:16px; +background-image:url('../static/img/etherpad_lite_icons.gif'); +} From 92377613d793ca3a046c0f448d3df27e01e08bbd Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 19:41:42 +0100 Subject: [PATCH 06/10] First version of working sprites -- Still some work to do such as changing export icons to use the latest .gif but this is good start --- static/pad.html | 70 ++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/static/pad.html b/static/pad.html index 956bcdb4a..f27580acd 100644 --- a/static/pad.html +++ b/static/pad.html @@ -23,76 +23,75 @@ From 1d62de9acfef7ad3a9ab20bc07c43dd6356aacb8 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 19:41:54 +0100 Subject: [PATCH 07/10] Updated CSS for sprites --- static/css/pad.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/css/pad.css b/static/css/pad.css index 0b01ab6a2..b3435b1ea 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -1050,5 +1050,6 @@ opacity:.8; .buttonicon{ width:16px; height:16px; -background-image:url('../static/img/etherpad_lite_icons.gif'); +background-image:url('../../static/img/etherpad_lite_icons.gif'); +background-repeat: no-repeat; } From 4d4773c1f35635d6cff758f77873c0b5e68cdc79 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 20:07:18 +0100 Subject: [PATCH 08/10] Fix CSS and HTML bugs with new sprites --- static/pad.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/pad.html b/static/pad.html index f27580acd..c0f215522 100644 --- a/static/pad.html +++ b/static/pad.html @@ -116,7 +116,7 @@ We removed this feature cause its not worth the space it needs in the editbar
  • -
    +
    1
    • @@ -248,7 +248,7 @@ Use this link to share a read-only version of your pad: Chat - +
    0 From 03192c1b9af0fdd2f8e57f1ab2786155c011ceac Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 31 Jul 2011 20:16:59 +0100 Subject: [PATCH 09/10] Fix the styling of the chat vdraggie --- static/css/pad.css | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index b3435b1ea..4bcd4cfca 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -308,7 +308,13 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } .hidesidebar #padeditor { right: 0; } #vdraggie { - background: url(static/img/vdraggie.gif) no-repeat top center; +/* background: url(static/img/vdraggie.gif) no-repeat top center;*/ + width:16px; + height:16px; + background-image:url('../../static/img/etherpad_lite_icons.gif'); + background-repeat: no-repeat; + background-position: 0px -300px; + cursor: W-resize; bottom:0; position:absolute; @@ -906,19 +912,18 @@ position: relative; display: block; } -/* -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable- autohide .ui-resizable-handle { display: none; } -*/ .ui-resizable-nw { + width:16px; + height:16px; + background-image:url('../../static/img/etherpad_lite_icons.gif'); + background-repeat: no-repeat; + background-position: 0px -455px; cursor: nw-resize; width: 22px; height: 22px; - left: 0px; top: 0px; - background-size: 100% auto; - background-image: url("../img/nw-resize.png"); - background-repeat: no-repeat; -/* background-position: -5px -5px;*/ + left: 2px; top: 1px; + background-size: 80% auto; } .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} From ab2c8fadf138e977fe47a7608e9db9ec599a8804 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 1 Aug 2011 20:01:41 +0100 Subject: [PATCH 10/10] Fix button alignment issues making the butotns prettier after I made them 1px out in places --- static/pad.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/pad.html b/static/pad.html index a1b343997..55ca7a69b 100644 --- a/static/pad.html +++ b/static/pad.html @@ -35,12 +35,12 @@
  • -
    +
  • -
    +