Git fail - redo previous commit

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 0696415a9f8ec7815be3cc46fc52bf775318be79..01e303ed312405dd8e433d97096a5365905d97d4 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -300,7 +300,7 @@ html, body { height:100%; }
 #kiwi.theme_relaxed #toolbar .panellist li.server span { background:url(../img/server_tab.png) no-repeat; padding-left:23px; }
 
 /* Tab texts are within a span */
-#kiwi.theme_relaxed #toolbar .panellist li span  { line-height:20px; vertical-align:middle; }
+#kiwi.theme_relaxed #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
 
 #kiwi.theme_relaxed #toolbar .panellist li.active .activity { display:none; }
 #kiwi.theme_relaxed #toolbar .panellist li .activity.zero { visibility:hidden; }
@@ -605,9 +605,9 @@ html, body { height:100%; }
 }
 
 #kiwi.theme_mini #toolbar #tabs { margin-right:0 !important; }
-#kiwi.theme_mini #toolbar .panellist .alert_highlight { background: #990000; }
-#kiwi.theme_mini #toolbar .panellist .alert_activity { background: #009900; }
-#kiwi.theme_mini #toolbar .panellist .alert_action { }
+#kiwi.theme_mini #toolbar .panellist .alert_highlight { font-weight:bold; }
+#kiwi.theme_mini #toolbar .panellist .alert_activity { font-weight:normal; }
+#kiwi.theme_mini #toolbar .panellist .alert_action { font-weight:normal; }
 
 #kiwi.theme_mini #toolbar .panellist .active { padding-right:23px; }
 #kiwi.theme_mini #toolbar .panellist li .part {
@@ -618,7 +618,11 @@ html, body { height:100%; }
 #kiwi.theme_mini #toolbar .panellist li.server span { background:url(../img/server_tab.png) no-repeat; padding-left:23px; }
 
 /* Tab texts are within a span */
-#kiwi.theme_mini #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:block; }
+#kiwi.theme_mini #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
+
+#kiwi.theme_mini #toolbar .panellist li .activity { display:inline; margin-left:0.5em; font-style:italic; font-size:0.8em; }
+#kiwi.theme_mini #toolbar .panellist li .activity:before { content:"("; }
+#kiwi.theme_mini #toolbar .panellist li .activity:after { content:")"; }
 
 #kiwi.theme_mini #status_message {
     background: #FEEFB3; color: #9F6000;
@@ -860,27 +864,8 @@ html, body { height:100%; }
     line-height: 1.4em;
     vertical-align: middle;
     
-    border-radius:5px;
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
-    -khtml-border-radius:5px;
-    behavior: url(border-radius.htc);
-
-    background-image: -webkit-gradient(
-        linear,
-        left top,
-        left bottom,
-        color-stop(0.38, rgb(238,238,238)),
-        color-stop(0.68, rgb(209,209,209))
-    );
-    background-image: -moz-linear-gradient(
-        center top,
-        rgb(238,238,238) 38%,
-        rgb(209,209,209) 68%
-    );
-
     border: 1px solid #333;
-    background-color: #eee;
+    background-color: #111;
 }
 
 #kiwi.theme_cli #toolbar .panellist .alert_highlight { font-weight:bold; }
@@ -892,12 +877,15 @@ html, body { height:100%; }
     background:url('../img/redcross.png'); width:14px; height:14px;
 }
 #kiwi.theme_cli #toolbar .panellist li .part:after { content:""; }
-#kiwi.theme_cli #toolbar .panellist li .activity { display:none; }
 
 #kiwi.theme_cli #toolbar .panellist li.server span { background:url(../img/server_tab.png) no-repeat; padding-left:23px; }
 
 /* Tab texts are within a span */
-#kiwi.theme_cli #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:block; }
+#kiwi.theme_cli #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
+
+#kiwi.theme_cli #toolbar .panellist li .activity { display:inline; margin-left:0.5em; font-style:italic; font-size:0.8em; }
+#kiwi.theme_cli #toolbar .panellist li .activity:before { content:"("; }
+#kiwi.theme_cli #toolbar .panellist li .activity:after { content:")"; }
 
 
 #kiwi.theme_cli #memberlists { background:#222222; }
@@ -1035,9 +1023,4 @@ html, body { height:100%; }
 #kiwi.theme_cli.chanlist_treeview #toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:200px; background:#1B1B1B; overflow-y:auto; }
 #kiwi.theme_cli.chanlist_treeview #tabs ul li { display:block; float:none; }
 #kiwi.theme_cli.chanlist_treeview #tabs ul li .activity { float:right; }
-#kiwi.theme_cli.chanlist_treeview #tabs ul li.active {
-    margin-right:0;
-    border-right-width:0;
-    border-bottom-right-radius:0;
-    border-top-right-radius:0;
-}
\ No newline at end of file
+#kiwi.theme_cli.chanlist_treeview #tabs ul li.active { padding-left:1em; }
\ No newline at end of file