Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite

2011-08-17 19:43:39 +01:00 · 2011-08-17 19:43:39 +01:00 · c8a0f946f2
parent c7f3b3d9ec 06037dcb8e
commit c8a0f946f2
3 changed files with 1 additions and 5 deletions
--- a/static/css/timeslider.css
+++ b/static/css/timeslider.css
@ -192,13 +192,9 @@ float:right;
  line-height: 29px;
  margin-top: 0;
  padding-right: 6pt;
+  color: #222;
 }

-
-
-  padding: 0;
-  margin: 0;
-}
 ul { margin-left: 1.5em; }
 ul ul { margin-left: 0 !important; }
 ul.list-bullet1 { margin-left: 1.5em; }
--- a/static/img/etherpad_lite_icons.gif
+++ b/static/img/etherpad_lite_icons.gif
--- a/static/img/etherpad_lite_icons.png
+++ b/static/img/etherpad_lite_icons.png