Merge.

diff --git a/bin/dependencies_b.py b/bin/dependencies_b.py
index b3b82b0b11b8521f884b8497837089614f3ccaaa..e02e875cba1f7417ab35450ad2662605572ed0f2 100644 (file)
--- a/bin/dependencies_b.py
+++ b/bin/dependencies_b.py
@@ -1,8 +1,9 @@
-# this is seperate to allow us to use python 2.5 syntax without\r
+# this is separate to allow us to use python 2.5 syntax without\r
 # the dependency checker breaking on earlier versions.\r
 \r
 import sys\r
 import subprocess\r
+import os\r
 \r
 def fail(*message):\r
   print >>sys.stderr, "\n".join(message)\r

diff --git a/css/qui.mcss b/css/qui.mcss
index ebbd2abb7a9db74947f0849eba7e9c3ef1e90a2c..32d5aa579c4c0d826f498792daabf50a23e72be3 100644 (file)
--- a/css/qui.mcss
+++ b/css/qui.mcss
@@ -148,6 +148,15 @@ html {
   background: $(tabbar_background);
 }
 
+.qwebirc-qui .outertabbar_top .dropdown-tab {
+  padding: 4px 3px 0 3px;
+}
+
+.qwebirc-qui .outertabbar_left .dropdown-tab {
+  padding: 3px 3px 0 3px;
+  margin-right: 2px;
+}
+
 .qwebirc-qui .outertabbar_left {
   border-right: 1px solid $(tabbar_border);
   overflow: auto;
@@ -156,7 +165,7 @@ html {
 .qwebirc-qui .outertabbar_left .tab {
   display: block;
   margin-right: 3px;
-  margin-top: 3px;
+  margin-top: 1px;
   line-height: normal;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -301,7 +310,6 @@ div#noscript {
   cursor: pointer;
   cursor: hand;
   float: left;
-  padding: 3px;
   width: 17px;
 }