From: Darren <darren@darrenwhitlen.com>
Date: Thu, 29 May 2014 20:55:41 +0000 (+0100)
Subject: Merge branch 'CoryChaplin-feature_user_count' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=04d088c73e2f2a90cd32d6138f6dcc608b081a78;p=KiwiIRC.git

Merge branch 'CoryChaplin-feature_user_count' into development

Conflicts:
	client/assets/themes/relaxed/style.css
---

04d088c73e2f2a90cd32d6138f6dcc608b081a78
diff --cc client/assets/themes/relaxed/style.css
index 736e5e8,3918487..6240767
--- a/client/assets/themes/relaxed/style.css
+++ b/client/assets/themes/relaxed/style.css
@@@ -187,9 -194,16 +187,17 @@@
      background-color: #DADADA;
      border-left: 1px solid #8A8A8A;
  }
 -#kiwi.narrow .right_bar { display:none; }
 +#kiwi.narrow .right_bar { width:100%; }
 +#kiwi.narrow .right_bar.disabled { width:0; }
  
+ #kiwi .memberlists .meta {
+     border-bottom: 1px solid #8A8A8A;
+     font-size: 0.9em;
+     margin-bottom: 10px;
+     padding: 0 0 5%;
+     text-align: center;
+ }
+ 
  #kiwi .memberlists ul { list-style: none; }
  #kiwi .memberlists ul.active { }
  #kiwi .memberlists ul li { padding: 0.2em 1em; }