Client: #toolbar change to .toolbar

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 5b26b69c377019ad7f389171788bcd894a136bf3..6c650cf2051f9a0722039dca7f04810ed41a6a9a 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -18,7 +18,7 @@ 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; }
 #kiwi #panels { position:absolute; left:0px; right:200px; bottom:100px; top:100px; }
 #kiwi #memberlists { position:absolute; right:0px; width:200px; bottom:100px; top:100px; overflow-y:auto; }
 #kiwi #controlbox { position: absolute; bottom:0px; width:100%; display:none; }
@@ -27,33 +27,33 @@ html, body { height:100%; }
 }
 
 
-#kiwi #toolbar #tabs { margin-right: 200px; }
-#kiwi #toolbar .panellist {
+#kiwi .toolbar #tabs { margin-right: 200px; }
+#kiwi .toolbar .panellist {
     overflow: hidden;
     display:block;
 }
-#kiwi #toolbar .panellist li {
+#kiwi .toolbar .panellist li {
     float: left; list-style: inline;
     display:inline; position:relative;
     padding:5px; margin:3px;
     cursor: pointer;
 }
 
-#kiwi #toolbar .panellist .active { padding-right:23px; }
-#kiwi #toolbar .panellist .alert_highlight { font-weight: bold; }
-#kiwi #toolbar .panellist .alert_activity { font-weight: bold; }
-#kiwi #toolbar .panellist .alert_action { font-weight: bold; }
+#kiwi .toolbar .panellist .active { padding-right:23px; }
+#kiwi .toolbar .panellist .alert_highlight { font-weight: bold; }
+#kiwi .toolbar .panellist .alert_activity { font-weight: bold; }
+#kiwi .toolbar .panellist .alert_action { font-weight: bold; }
 
-#kiwi #toolbar .panellist li { width: auto; text-align: left; }
-#kiwi #toolbar .panellist li .part { position: absolute; top: 5px; right: 5px; }
-#kiwi #toolbar .panellist li .part:before { content:"[x]"; }
-#kiwi #toolbar .panellist li .part:hover { color: #900; }
-#kiwi #toolbar .panellist li img.icon { left:5px; top:2px; height:auto; width:auto; }
+#kiwi .toolbar .panellist li { width: auto; text-align: left; }
+#kiwi .toolbar .panellist li .part { position: absolute; top: 5px; right: 5px; }
+#kiwi .toolbar .panellist li .part:before { content:"[x]"; }
+#kiwi .toolbar .panellist li .part:hover { color: #900; }
+#kiwi .toolbar .panellist li img.icon { left:5px; top:2px; height:auto; width:auto; }
 
-#kiwi #toolbar .connections { overflow:hidden; }
-#kiwi #toolbar .connections .connection { float:left; }
-#kiwi #toolbar .connections .panellist { display:inline; }
-#kiwi #toolbar .connections .panellist:after { content:""; }
+#kiwi .toolbar .connections { overflow:hidden; }
+#kiwi .toolbar .connections .connection { float:left; }
+#kiwi .toolbar .connections .panellist { display:inline; }
+#kiwi .toolbar .connections .panellist:after { content:""; }
 
 #kiwi #status_message {
     background: #FFF;
@@ -209,11 +209,11 @@ html, body { height:100%; }
 
 
 /* Icons in the top right corner */
-#kiwi #toolbar .app_tools { float:right; }
-#kiwi #toolbar .app_tools ul li {
+#kiwi .toolbar .app_tools { float:right; }
+#kiwi .toolbar .app_tools ul li {
     display:inline; cursor:pointer;
 }
-#kiwi #toolbar .app_tools img { height:25px; width:25px; margin: 6px 0.7em 0 0; }
+#kiwi .toolbar .app_tools img { height:25px; width:25px; margin: 6px 0.7em 0 0; }
 
 
 
@@ -314,14 +314,14 @@ html, body { height:100%; }
     border: none;
     border-radius: 3px;
 }
-#kiwi.theme_relaxed #toolbar {
+#kiwi.theme_relaxed .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
 #kiwi.theme_relaxed #controlbox { background-color:#1B1B1B; }
 #kiwi.theme_relaxed #memberlists_resize_handle {
     /*background:url('../img/resize_handle.png') no-repeat; background-position:center;*/
 }
-#kiwi.theme_relaxed #toolbar .panellist li {
+#kiwi.theme_relaxed .toolbar .panellist li {
     line-height: 1.4em;
     vertical-align: middle;
     
@@ -348,23 +348,23 @@ html, body { height:100%; }
     background-color: #eee;
 }
 
-#kiwi.theme_relaxed #toolbar .panellist .alert_highlight { /*background: #990000;*/ }
-#kiwi.theme_relaxed #toolbar .panellist .alert_activity { font-weight:normal; }
-#kiwi.theme_relaxed #toolbar .panellist .alert_action { font-weight:normal; }
+#kiwi.theme_relaxed .toolbar .panellist .alert_highlight { /*background: #990000;*/ }
+#kiwi.theme_relaxed .toolbar .panellist .alert_activity { font-weight:normal; }
+#kiwi.theme_relaxed .toolbar .panellist .alert_action { font-weight:normal; }
 
-#kiwi.theme_relaxed #toolbar .panellist .active { padding-right:23px; border-top:2px solid #df6b26; border-bottom:none; }
-#kiwi.theme_relaxed #toolbar .panellist li .part:before { content:"\f00d"; }
+#kiwi.theme_relaxed .toolbar .panellist .active { padding-right:23px; border-top:2px solid #df6b26; border-bottom:none; }
+#kiwi.theme_relaxed .toolbar .panellist li .part:before { content:"\f00d"; }
 
-#kiwi.theme_relaxed #toolbar .panellist li.server span { padding-left: 5px; }
-#kiwi.theme_relaxed.connected #toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
-#kiwi.theme_relaxed #toolbar .panellist li.server:before { content: "\f06a"; color:#900; font-size:1.5em; line-height:1em; vertical-align:middle; }
+#kiwi.theme_relaxed .toolbar .panellist li.server span { padding-left: 5px; }
+#kiwi.theme_relaxed.connected .toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
+#kiwi.theme_relaxed .toolbar .panellist li.server:before { content: "\f06a"; color:#900; font-size:1.5em; line-height:1em; vertical-align:middle; }
 
 /* Tab texts are within a span */
-#kiwi.theme_relaxed #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
+#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; }
-#kiwi.theme_relaxed #toolbar .panellist li .activity {
+#kiwi.theme_relaxed .toolbar .panellist li.active .activity { display:none; }
+#kiwi.theme_relaxed .toolbar .panellist li .activity.zero { visibility:hidden; }
+#kiwi.theme_relaxed .toolbar .panellist li .activity {
     padding: 1px 3px; margin-left:1em;
     border-radius: 4px;
     background: #3F9532; color:#000; /*color: #ff5300;*/
@@ -372,7 +372,7 @@ html, body { height:100%; }
     display:inline-block;
     width:2em;
 }
-#kiwi.theme_relaxed #toolbar .panellist li.alert_highlight .activity {
+#kiwi.theme_relaxed .toolbar .panellist li.alert_highlight .activity {
     color: #fff; background: #a60400;
 }
 
@@ -563,18 +563,18 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_relaxed #toolbar .app_tools { width:200px; padding-left:10px; color:#D4D4D4; }
-#kiwi.theme_relaxed.narrow #toolbar #tabs { margin-right:0; }
-#kiwi.theme_relaxed.narrow #toolbar .app_tools { width:auto; }
-#kiwi.theme_relaxed #toolbar .app_tools ul li {
+#kiwi.theme_relaxed .toolbar .app_tools { width:200px; padding-left:10px; color:#D4D4D4; }
+#kiwi.theme_relaxed.narrow .toolbar #tabs { margin-right:0; }
+#kiwi.theme_relaxed.narrow .toolbar .app_tools { width:auto; }
+#kiwi.theme_relaxed .toolbar .app_tools ul li {
     font-size:26px;
     -webkit-transition: all .3s ease;
     -moz-transition: all .3s ease;
     transition: all .3s ease;
     margin-left:10px;
 }
-#kiwi.theme_relaxed #toolbar .app_tools ul li:hover { color:#88C56A; }
-#kiwi.theme_relaxed #toolbar .app_tools img { }
+#kiwi.theme_relaxed .toolbar .app_tools ul li:hover { color:#88C56A; }
+#kiwi.theme_relaxed .toolbar .app_tools img { }
 
 
 /* The server select dialog */
@@ -612,10 +612,10 @@ html, body { height:100%; }
 
 
 #kiwi.theme_relaxed.chanlist_treeview #panels { left:160px; }
-#kiwi.theme_relaxed.chanlist_treeview #toolbar { position:static; }
-#kiwi.theme_relaxed.chanlist_treeview #toolbar .app_tools { float:none; }
-#kiwi.theme_relaxed.chanlist_treeview #toolbar > div { margin-left:160px; }
-#kiwi.theme_relaxed.chanlist_treeview #toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
+#kiwi.theme_relaxed.chanlist_treeview .toolbar { position:static; }
+#kiwi.theme_relaxed.chanlist_treeview .toolbar .app_tools { float:none; }
+#kiwi.theme_relaxed.chanlist_treeview .toolbar > div { margin-left:160px; }
+#kiwi.theme_relaxed.chanlist_treeview .toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
 #kiwi.theme_relaxed.chanlist_treeview #tabs ul li { display:block; float:none; }
 #kiwi.theme_relaxed.chanlist_treeview #tabs ul li .activity { position:absolute; right:5px; }
 #kiwi.theme_relaxed.chanlist_treeview #tabs ul li.active {
@@ -683,14 +683,14 @@ html, body { height:100%; }
     border: none;
     border-radius: 3px;
 }
-#kiwi.theme_mini #toolbar {
+#kiwi.theme_mini .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
 #kiwi.theme_mini #controlbox { background-color:#1B1B1B; }
 #kiwi.theme_mini #memberlists_resize_handle {
     display:none; width:0;
 }
-#kiwi.theme_mini #toolbar .panellist li {
+#kiwi.theme_mini .toolbar .panellist li {
     line-height: 1.4em;
     vertical-align: middle;
     
@@ -703,24 +703,24 @@ html, body { height:100%; }
     background-color: #eee;
 }
 
-#kiwi.theme_mini #toolbar #tabs { margin-right:0 !important; }
-#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 #tabs { margin-right:0 !important; }
+#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; border-top:2px solid #df6b26; border-bottom:none; }
-#kiwi.theme_mini #toolbar .panellist li .part:before { content:"\f00d"; }
+#kiwi.theme_mini .toolbar .panellist .active { padding-right:23px; border-top:2px solid #df6b26; border-bottom:none; }
+#kiwi.theme_mini .toolbar .panellist li .part:before { content:"\f00d"; }
 
-#kiwi.theme_mini #toolbar .panellist li.server span { padding-left:5px; }
-#kiwi.theme_mini.connected #toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
-#kiwi.theme_mini #toolbar .panellist li.server:before { content: "\f06a"; color:#900; }
+#kiwi.theme_mini .toolbar .panellist li.server span { padding-left:5px; }
+#kiwi.theme_mini.connected .toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
+#kiwi.theme_mini .toolbar .panellist li.server:before { content: "\f06a"; color:#900; }
 
 /* Tab texts are within a span */
-#kiwi.theme_mini #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-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 .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;
@@ -835,16 +835,16 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_mini #toolbar .app_tools { padding-left:10px; color:#D4D4D4; }
-#kiwi.theme_mini #toolbar .app_tools ul li {
+#kiwi.theme_mini .toolbar .app_tools { padding-left:10px; color:#D4D4D4; }
+#kiwi.theme_mini .toolbar .app_tools ul li {
     font-size:26px;
     -webkit-transition: all .3s ease;
     -moz-transition: all .3s ease;
     transition: all .3s ease;
     margin-left:10px;
 }
-#kiwi.theme_mini #toolbar .app_tools ul li:hover { color:#88C56A; }
-#kiwi.theme_mini #toolbar .app_tools img { }
+#kiwi.theme_mini .toolbar .app_tools ul li:hover { color:#88C56A; }
+#kiwi.theme_mini .toolbar .app_tools img { }
 
 
 /* The server select dialog */
@@ -951,18 +951,18 @@ html, body { height:100%; }
     border-bottom: 1px solid #444444;
 }
 
-#kiwi.theme_cli #toolbar .app_tools { width:200px; padding-left:10px; color:#D4D4D4; }
-#kiwi.theme_cli #toolbar .app_tools ul li {
+#kiwi.theme_cli .toolbar .app_tools { width:200px; padding-left:10px; color:#D4D4D4; }
+#kiwi.theme_cli .toolbar .app_tools ul li {
     font-size:26px;
     -webkit-transition: all .3s ease;
     -moz-transition: all .3s ease;
     transition: all .3s ease;
     margin-left:10px;
 }
-#kiwi.theme_cli #toolbar .app_tools ul li:hover { color:#88C56A; }
-#kiwi.theme_cli #toolbar .app_tools img { }
+#kiwi.theme_cli .toolbar .app_tools ul li:hover { color:#88C56A; }
+#kiwi.theme_cli .toolbar .app_tools img { }
 
-#kiwi.theme_cli #toolbar .panellist li {
+#kiwi.theme_cli .toolbar .panellist li {
     line-height: 1.4em;
     vertical-align: middle;
     
@@ -970,24 +970,24 @@ html, body { height:100%; }
     background-color: #111;
 }
 
-#kiwi.theme_cli #toolbar .panellist .alert_highlight { font-weight:bold; }
-#kiwi.theme_cli #toolbar .panellist .alert_activity { font-weight:normal; }
-#kiwi.theme_cli #toolbar .panellist .alert_action { font-weight:normal; }
+#kiwi.theme_cli .toolbar .panellist .alert_highlight { font-weight:bold; }
+#kiwi.theme_cli .toolbar .panellist .alert_activity { font-weight:normal; }
+#kiwi.theme_cli .toolbar .panellist .alert_action { font-weight:normal; }
 
-#kiwi.theme_cli #toolbar .panellist .active { padding-right:23px; border-top:2px solid #df6b26; border-bottom:none; }
-#kiwi.theme_cli #toolbar .panellist li .part:before { content:"\f00d"; }
+#kiwi.theme_cli .toolbar .panellist .active { padding-right:23px; border-top:2px solid #df6b26; border-bottom:none; }
+#kiwi.theme_cli .toolbar .panellist li .part:before { content:"\f00d"; }
 
-#kiwi.theme_cli #toolbar .panellist li.server span { padding-left:5px; }
-#kiwi.theme_cli.connected #toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
-#kiwi.theme_cli #toolbar .panellist li.server:before { content: "\f06a"; color:#900; }
+#kiwi.theme_cli .toolbar .panellist li.server span { padding-left:5px; }
+#kiwi.theme_cli.connected .toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
+#kiwi.theme_cli .toolbar .panellist li.server:before { content: "\f06a"; color:#900; }
 
 /* Tab texts are within a span */
-#kiwi.theme_cli #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-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 #toolbar .panellist li.alert_highlight .activity {
+#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 .toolbar .panellist li.alert_highlight .activity {
     color: #fff; background: #a60400; padding:2px; border-radius:3px;
 }
 
@@ -1124,10 +1124,10 @@ html, body { height:100%; }
 
 
 #kiwi.theme_cli.chanlist_treeview #panels { left:200px; }
-#kiwi.theme_cli.chanlist_treeview #toolbar { position:static; }
-#kiwi.theme_cli.chanlist_treeview #toolbar .app_tools { float:none; }
-#kiwi.theme_cli.chanlist_treeview #toolbar > div { }
-#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 .toolbar { position:static; }
+#kiwi.theme_cli.chanlist_treeview .toolbar .app_tools { float:none; }
+#kiwi.theme_cli.chanlist_treeview .toolbar > div { }
+#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 { padding-left:1em; }
@@ -1173,14 +1173,14 @@ html, body { height:100%; }
     border: none;
     border-radius: 3px;
 }
-#kiwi.theme_basic #toolbar {
+#kiwi.theme_basic .toolbar {
     background-color:#1B1B1B; font-size:0.9em;
 }
 #kiwi.theme_basic #controlbox { background-color:#1B1B1B; }
 #kiwi.theme_basic #memberlists_resize_handle {
     /*display:none; width:0;*/
 }
-#kiwi.theme_basic #toolbar .panellist li {
+#kiwi.theme_basic .toolbar .panellist li {
     line-height: 1.4em;
     vertical-align: middle;
     
@@ -1193,26 +1193,26 @@ html, body { height:100%; }
     background-color: #eee;
 }
 
-#kiwi.theme_basic #toolbar #tabs { margin-right:0 !important; }
-#kiwi.theme_basic #toolbar .panellist .alert_highlight { font-weight:bold; color:red; }
-#kiwi.theme_basic #toolbar .panellist .alert_activity { font-weight:normal; color:green; }
-#kiwi.theme_basic #toolbar .panellist .alert_action { font-weight:normal; color:green; }
+#kiwi.theme_basic .toolbar #tabs { margin-right:0 !important; }
+#kiwi.theme_basic .toolbar .panellist .alert_highlight { font-weight:bold; color:red; }
+#kiwi.theme_basic .toolbar .panellist .alert_activity { font-weight:normal; color:green; }
+#kiwi.theme_basic .toolbar .panellist .alert_action { font-weight:normal; color:green; }
 
-#kiwi.theme_basic #toolbar .panellist .active { padding-right:25px; border-top:2px solid #df6b26; border-bottom:none; }
-#kiwi.theme_basic #toolbar .panellist li .part {}
-#kiwi.theme_basic #toolbar .panellist li .part:before { content:"[x]"; }
+#kiwi.theme_basic .toolbar .panellist .active { padding-right:25px; border-top:2px solid #df6b26; border-bottom:none; }
+#kiwi.theme_basic .toolbar .panellist li .part {}
+#kiwi.theme_basic .toolbar .panellist li .part:before { content:"[x]"; }
 
-#kiwi.theme_basic #toolbar .panellist li.server span { padding-left: 5px; }
-#kiwi.theme_basic.connected #toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
-#kiwi.theme_basic #toolbar .panellist li.server:before { content: "\f06a"; color:#900; font-size:1.5em; line-height:1em; vertical-align:middle; }
+#kiwi.theme_basic .toolbar .panellist li.server span { padding-left: 5px; }
+#kiwi.theme_basic.connected .toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
+#kiwi.theme_basic .toolbar .panellist li.server:before { content: "\f06a"; color:#900; font-size:1.5em; line-height:1em; vertical-align:middle; }
 
 
 /* Tab texts are within a span */
-#kiwi.theme_basic #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
+#kiwi.theme_basic .toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
 
-#kiwi.theme_basic #toolbar .panellist li .activity { display:inline; margin-left:0.5em; font-style:italic; font-size:0.8em; }
-#kiwi.theme_basic #toolbar .panellist li .activity:before { content:"("; }
-#kiwi.theme_basic #toolbar .panellist li .activity:after { content:")"; }
+#kiwi.theme_basic .toolbar .panellist li .activity { display:inline; margin-left:0.5em; font-style:italic; font-size:0.8em; }
+#kiwi.theme_basic .toolbar .panellist li .activity:before { content:"("; }
+#kiwi.theme_basic .toolbar .panellist li .activity:after { content:")"; }
 
 #kiwi.theme_basic #status_message {
     background: #FEEFB3; color: #9F6000;
@@ -1380,16 +1380,16 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_basic #toolbar .app_tools { padding-left:10px; color:#D4D4D4; }
-#kiwi.theme_basic #toolbar .app_tools ul li {
+#kiwi.theme_basic .toolbar .app_tools { padding-left:10px; color:#D4D4D4; }
+#kiwi.theme_basic .toolbar .app_tools ul li {
     font-size:26px;
     -webkit-transition: all .3s ease;
     -moz-transition: all .3s ease;
     transition: all .3s ease;
     margin-left:10px;
 }
-#kiwi.theme_basic #toolbar .app_tools ul li:hover { color:#88C56A; }
-#kiwi.theme_basic #toolbar .app_tools img { }
+#kiwi.theme_basic .toolbar .app_tools ul li:hover { color:#88C56A; }
+#kiwi.theme_basic .toolbar .app_tools img { }
 
 
 /* The server select dialog */
@@ -1427,10 +1427,10 @@ html, body { height:100%; }
 
 
 #kiwi.theme_basic.chanlist_treeview #panels { left:160px; }
-#kiwi.theme_basic.chanlist_treeview #toolbar { position:static; }
-#kiwi.theme_basic.chanlist_treeview #toolbar .app_tools { float:none; }
-#kiwi.theme_basic.chanlist_treeview #toolbar > div { margin-left:160px; }
-#kiwi.theme_basic.chanlist_treeview #toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
+#kiwi.theme_basic.chanlist_treeview .toolbar { position:static; }
+#kiwi.theme_basic.chanlist_treeview .toolbar .app_tools { float:none; }
+#kiwi.theme_basic.chanlist_treeview .toolbar > div { margin-left:160px; }
+#kiwi.theme_basic.chanlist_treeview .toolbar #tabs { position:absolute; left:0px; bottom:0px; top:0px; margin:0; width:160px; background:#1B1B1B; overflow-y:auto; }
 #kiwi.theme_basic.chanlist_treeview #tabs ul li { display:block; float:none; }
 #kiwi.theme_basic.chanlist_treeview #tabs ul li .activity { float:right; }
 #kiwi.theme_basic.chanlist_treeview #tabs ul li.active {

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index 0721a9e5d7cfec43731863f97e0de16440c2dcf5..84e7a7e6eb2c4c98ad9fc26752aefb1b4a4bb691 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -15,7 +15,7 @@
 </head>\r
 <body>\r
     <div id="kiwi" class="theme_relaxed">\r
-        <div id="toolbar">\r
+        <div class="toolbar">\r
             <div class="app_tools">\r
                 <ul class="main">\r
                     <li class="settings"><i class="icon-cogs" title="Settings"></i></li>\r

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 0fe66b1d18b8b9226cdac55497c1877360029e9f..91da42eaf3a919724d4f6b47463218b9792c4c87 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -119,7 +119,7 @@ _kiwi.model.Application = function () {
 \r
             this.topicbar = new _kiwi.view.TopicBar({el: $('#topic')[0]});\r
 \r
-            new _kiwi.view.AppToolbar({el: $('#toolbar .app_tools')[0]});\r
+            new _kiwi.view.AppToolbar({el: _kiwi.app.view.$el.find('.toolbar .app_tools')[0]});\r
 \r
             this.message = new _kiwi.view.StatusMessage({el: $('#status_message')[0]});\r
 \r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index 7d60728fbf265bda31b3b76d60727b94e971dd43..c5f965fa0c8d8e15abccbdbc42501a99cd34be17 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -1306,7 +1306,7 @@ _kiwi.view.Application = Backbone.View.extend({
         var that = this;\r
 \r
         $(window).resize(function() { that.doLayout.apply(that); });\r
-        $('#toolbar').resize(function() { that.doLayout.apply(that); });\r
+        this.$el.find('.toolbar').resize(function() { that.doLayout.apply(that); });\r
         $('#controlbox').resize(function() { that.doLayout.apply(that); });\r
 \r
         // Change the theme when the config is changed\r
@@ -1404,7 +1404,7 @@ _kiwi.view.Application = Backbone.View.extend({
         var el_kiwi = this.$el;\r
         var el_panels = $('#kiwi #panels');\r
         var el_memberlists = $('#kiwi #memberlists');\r
-        var el_toolbar = $('#kiwi #toolbar');\r
+        var el_toolbar = this.$el.find('.toolbar');\r
         var el_controlbox = $('#kiwi #controlbox');\r
         var el_resize_handle = $('#kiwi #memberlists_resize_handle');\r
 \r
@@ -1533,10 +1533,10 @@ _kiwi.view.Application = Backbone.View.extend({
         var that = this;\r
 \r
         if (!instant) {\r
-            $('#toolbar').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
+            this.$el.find('.toolbar').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
             $('#controlbox').slideUp({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
         } else {\r
-            $('#toolbar').slideUp(0);\r
+            this.$el.find('.toolbar').slideUp(0);\r
             $('#controlbox').slideUp(0);\r
             this.doLayout();\r
         }\r
@@ -1546,10 +1546,10 @@ _kiwi.view.Application = Backbone.View.extend({
         var that = this;\r
 \r
         if (!instant) {\r
-            $('#toolbar').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
+            this.$el.find('.toolbar').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
             $('#controlbox').slideDown({queue: false, duration: 400, step: $.proxy(this.doLayout, this)});\r
         } else {\r
-            $('#toolbar').slideDown(0);\r
+            this.$el.find('.toolbar').slideDown(0);\r
             $('#controlbox').slideDown(0);\r
             this.doLayout();\r
         }\r