From 6f7a9ce77aaeed6a38a8c10df3edf30ffe04f49d Mon Sep 17 00:00:00 2001 From: Robin Buse Date: Tue, 16 Aug 2011 23:40:07 +0300 Subject: [PATCH 1/3] Redesigned pad editbar + chatbox (bg color) --- static/css/pad.css | 62 ++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index 8b0db73c0..fed224a8d 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -38,38 +38,36 @@ a img } -#editbar +#editbar { - background-color: #F3F7F9; - width: 100%; - height: 31px; - padding-top: 4px; + background: #f7f7f7; + background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%); + background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%); border-bottom: 1px solid #ccc; + height: 32px; overflow: hidden; + padding-top: 3px; + width: 100%; } -#editbar ul li +#editbar ul li { - float: left; - margin-left: 2px; - background-color: #fff; - - -moz-border-radius: 4px; - border-radius: 4px; - + background: #fff; + background: -moz-linear-gradient(#fff, #f0f0f0); + background: -ms-linear-gradient(#fff, #f0f0f0); + background: -o-linear-gradient(#fff, #f0f0f0); + background: -webkit-linear-gradient(#fff, #f0f0f0); border: 1px solid #ccc; - padding: 4px 5px; - - height: 18px; - width: 18px; - + border-radius: 4px; cursor: pointer; - + float: left; + height: 18px; + margin-left: 2px; overflow: hidden; - - background: white; /* fallback for older/unsupporting browsers */ - background: -moz-linear-gradient(top, #eee, white 20%, white 20%); - background: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), color-stop(20%, white), color-stop(20%, white)); + padding: 4px 5px; + width: 18px; } #editbar ul li a @@ -84,12 +82,22 @@ a img top:-2px } -#editbar ul li:hover -{ - border: 1px solid #888; +#editbar ul li:hover { background: #fff; } +#editbar ul li:active { + background: #eee; + background: -moz-linear-gradient(#ddd, #fff); + background: -ms-linear-gradient(#ddd, #fff); + background: -o-linear-gradient(#ddd, #fff); + background: -webkit-linear-gradient(#ddd, #fff); +} + +input[type="file"] { + color: #fff; +} + #editbar ul li.separator { border: inherit; @@ -780,7 +788,7 @@ ul#colorpickerswatches li:hover width: 180px; height: 200px; z-index: 400; - background-color:#f3f7f9; + background-color:#f7f7f7; border-left: 1px solid #999; border-right: 1px solid #999; border-top: 1px solid #999; From ac0dff0c2cafc5e10250d5261afe146c1646c294 Mon Sep 17 00:00:00 2001 From: Robin Buse Date: Tue, 16 Aug 2011 23:44:43 +0300 Subject: [PATCH 2/3] height @ #editbar ul is redundant && removed some space --- static/css/pad.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index fed224a8d..9f3739d6b 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -33,8 +33,7 @@ a img padding-right: 3px; padding-left: 1px; z-index: 2; - height: 31px; - overflow: hidden; + overflow: hidden; } From 58ea0d0ed35bdebbaec4ebbe83a62547c902c8a1 Mon Sep 17 00:00:00 2001 From: Robin Buse Date: Wed, 17 Aug 2011 19:14:43 +0300 Subject: [PATCH 3/3] changed .gif to .png --- static/css/pad.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index 9f3739d6b..ac5a32b9b 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -320,7 +320,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } /* background: url(static/img/vdraggie.gif) no-repeat top center;*/ width:16px; height:16px; - background-image:url('../../static/img/etherpad_lite_icons.gif'); + background-image:url('../../static/img/etherpad_lite_icons.png'); background-repeat: no-repeat; background-position: 0px -300px; @@ -1071,7 +1071,7 @@ opacity:.8; .buttonicon{ width:16px; height:16px; -background-image:url('../../static/img/etherpad_lite_icons.gif'); +background-image:url('../../static/img/etherpad_lite_icons.png'); background-repeat: no-repeat; margin-left: 1px; margin-top: 1px;