From 584080ab9f67ae1f1508e2ab3e5e62ee3783fda4 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Mon, 30 Jun 2014 17:49:57 +0100
Subject: [PATCH] Channel tools no longer scrolling with nick list

---
 client/assets/css/style.css            | 18 ++++++++++++++++--
 client/assets/themes/basic/style.css   |  1 +
 client/assets/themes/mini/style.css    |  1 +
 client/assets/themes/relaxed/style.css |  4 +++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 1d1fd7c..10b1449 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -37,10 +37,10 @@ html, body { height:100%; }
 /**
  * Main layout blocks
  */
-#kiwi .toolbar { position:absolute; top:0px; width:100%; display:none; }
+#kiwi .toolbar { position:absolute; top:0px; width:100%; display:none; z-index:1; }
 #kiwi .panels { position:absolute; left:0px; right:200px; bottom:100px; top:100px; }
 #kiwi .right_bar { position:absolute; right:0px; width:200px; bottom:100px; top:100px; overflow:visible; }
-#kiwi .right-bar-content { overflow-y:auto; position:relative; height:100% ;}
+#kiwi .right-bar-content { position:relative; height:100%; z-index:0; }
 #kiwi .controlbox { position: absolute; bottom:0px; width:100%; display:none; }
 #kiwi .memberlists_resize_handle {
     position: absolute; width:10px; z-index:1; cursor:w-resize;
@@ -83,6 +83,11 @@ html, body { height:100%; }
 }
 
 #kiwi .channel_tools {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 1;
 }
 #kiwi .channel_tools i {
     width: 32%;
@@ -149,6 +154,15 @@ html, body { height:100%; }
 }
 
 /* The active channels nicklist */
+#kiwi .memberlists {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    top: 0;
+    width: 100%;
+    overflow-y: auto;
+    padding-top: 50px;
+}
 #kiwi .memberlists > div { display:none; }
 #kiwi .memberlists > div.active { display:block; }
 #kiwi .memberlists ul li { overflow-y:auto; overflow-x:hidden; cursor:pointer; }
diff --git a/client/assets/themes/basic/style.css b/client/assets/themes/basic/style.css
index 8c5c0b7..795567e 100644
--- a/client/assets/themes/basic/style.css
+++ b/client/assets/themes/basic/style.css
@@ -84,6 +84,7 @@
 #kiwi .channel_tools {
     margin-bottom: 5px;
     padding: 0 5%;
+    background: #DADADA;
 }
 #kiwi .channel_tools i {
     width: 30%;
diff --git a/client/assets/themes/mini/style.css b/client/assets/themes/mini/style.css
index de2160a..6ebb340 100644
--- a/client/assets/themes/mini/style.css
+++ b/client/assets/themes/mini/style.css
@@ -83,6 +83,7 @@
     border-bottom: 1px solid #8A8A8A;
     margin-bottom: 10px;
     padding: 0 5%;
+    background: #DADADA;
 }
 #kiwi .channel_tools i {
     width: 30%;
diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css
index c263108..58cdf81 100644
--- a/client/assets/themes/relaxed/style.css
+++ b/client/assets/themes/relaxed/style.css
@@ -96,6 +96,7 @@
     border-bottom: 1px solid #8A8A8A;
     margin-bottom: 10px;
     padding: 0 5%;
+    background: #DADADA;
 }
 #kiwi .channel_tools i {
     width: 30%;
@@ -190,6 +191,7 @@
 #kiwi.narrow .right_bar { width:100%; }
 #kiwi.narrow .right_bar.disabled { width:0; }
 
+#kiwi .memberlists {}
 #kiwi .memberlists .meta {
     border-bottom: 1px solid #8A8A8A;
     font-size: 0.9em;
@@ -306,7 +308,7 @@
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
     background-color:#FFF;
-    z-index: 1;
+    z-index: 10;
     height:auto; bottom:auto;
     border-bottom: 2px solid #121314;
 }
-- 
2.25.1