Merge branch 'chanlist' of https://github.com/CoryChaplin/KiwiIRC into development

diff --cc client/assets/css/style.css
index 7c69af3e3e7b9fcb3ce27be25faafa09a2f22b62,dfaa40842ae930e380eecdce4e3ba53b71aece8c..00de4618087a2fbf343259a93f52447d48a7db98
--- 1/client/assets/css/style.css
--- 2/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@@ -474,3 -466,10 +474,10 @@@ html, body { height:100%; 
      padding: 5px; border-top:1px solid #e9e9e9; background:#ddd; overflow:hidden;
  }
  #kiwi .ui_menu .ui_menu_foot .close { }
 -}
+ 
+ #kiwi .applet .applet_chanlist .icon-sort-down:before, #kiwi .applet .applet_chanlist .icon-sort-up:before {
+     padding-left: 1em;
+ }
+ #kiwi .applet .applet_chanlist td {
+     min-width: 120px;
++}

diff --cc client/assets/themes/basic/style.css
Simple merge

diff --cc client/assets/themes/cli/style.css
Simple merge

diff --cc client/assets/themes/mini/style.css
Simple merge

diff --cc client/assets/themes/relaxed/style.css
Simple merge

diff --cc client/src/index.html.tmpl
Simple merge