X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=client%2Fassets%2Fcss%2Fstyle.css;h=176d0c8fe88c2ec8858eea602777c0142688bb45;hb=707593d22d5143fc1f57834eb0f432e10aea35c4;hp=46556ce9792c517bdcaef9c6062f31e3901fc028;hpb=c966123adffe03d432c148732c19ad8eec267ebf;p=KiwiIRC.git

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 46556ce..176d0c8 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -12,12 +12,13 @@ html, body { height:100%; }
 #kiwi p { margin:0.5em 0; }
 #kiwi a { color:#36C; text-decoration:none; cursor:pointer; }
 #kiwi a img { border:none; }
+#kiwi .format_span a { color: inherit; background-color: inherit; text-decoration: inherit; font-style: inherit; font-weight: inherit;}
 
 
 /**
  * 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; }
@@ -26,35 +27,35 @@ 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 {
+#kiwi .status_message {
     background: #FFF;
     border-bottom: 1px solid;
     text-align: center;
@@ -151,8 +152,8 @@ html, body { height:100%; }
 /**
  * Topic bar
  */
-#kiwi #topic { position:relative; height:2em; }
-#kiwi #topic div {
+#kiwi .toolbar .topic { position:relative; height:2em; }
+#kiwi .toolbar .topic div {
     position:absolute;
     top:0; bottom:0; left:0; right:0;
     overflow: hidden;
@@ -165,7 +166,8 @@ html, body { height:100%; }
 /**
  * Server selection dialog
  */
-#kiwi .server_select { width:800px; margin:0 auto; overflow:hidden; }
+#kiwi .server_select { position:relative; width:320px; margin:0 auto; overflow:hidden; }
+#kiwi .server_select.initial { margin-top: 3em; }
 #kiwi .server_select .more { display: none; }
 #kiwi .server_select button {  }
 #kiwi .server_select input { }
@@ -176,9 +178,21 @@ html, body { height:100%; }
 #kiwi .server_select .basic { border-bottom: 1px solid gray; margin-bottom:1em; }
 #kiwi .server_select .basic .show_more { }
 #kiwi .server_select .basic tr.pass { display:none; }
+#kiwi .server_select .basic tr.key { display:none; }
 #kiwi .server_select.single_server .basic { border:none; }
 #kiwi .server_select .status {  }
 
+/* Channel key icon */
+#kiwi .server_select .basic tr.channel td { position: relative; }
+#kiwi .server_select .basic tr.channel .icon-key {
+    position: absolute;
+    top: 0.4em;
+    right: 0.6em;
+    font-size: 1.3em;
+    cursor: pointer;
+}
+#kiwi .server_select .basic tr.have_key { display:none; }
+
 /* When connected to an IRC server, .ok is set on the status div */
 #kiwi .server_select .status.ok { }
 
@@ -195,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; }
 
 
 
@@ -300,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;
     
@@ -334,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; }
-#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;*/
@@ -358,17 +372,17 @@ 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;
 }
 
-#kiwi.theme_relaxed #status_message {
+#kiwi.theme_relaxed .status_message {
     background: #FEEFB3; color: #9F6000;
     border-bottom: 1px solid;
     padding: 0.9em;
     text-align: center; font-size:1.1em;
 }
-#kiwi.theme_relaxed #status_message.err { color:#D8000C; background:#FFBABA; }
+#kiwi.theme_relaxed .status_message.err { color:#D8000C; background:#FFBABA; }
 
 #kiwi.theme_relaxed .messages { color: #333333; }
 #kiwi.theme_relaxed .messages.active { }
@@ -526,8 +540,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_relaxed #topic { background-color:#1B1B1B; padding-bottom:2px; }
-#kiwi.theme_relaxed #topic div {
+#kiwi.theme_relaxed .toolbar .topic { background-color:#1B1B1B; padding-bottom:2px; }
+#kiwi.theme_relaxed .toolbar .topic div {
     padding: 0.2em 1em;
     text-align: center;
     box-shadow: none;
@@ -538,7 +552,7 @@ html, body { height:100%; }
     outline: none;
     white-space: nowrap;
 }
-#kiwi.theme_relaxed #topic:hover div {
+#kiwi.theme_relaxed .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -549,22 +563,22 @@ 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 */
-#kiwi.theme_relaxed .server_select { width:730px;  padding:3em 0 2em 0; margin: 0 auto; }
+#kiwi.theme_relaxed .server_select { margin-left:auto; margin-right:auto; }
 #kiwi.theme_relaxed .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_relaxed .server_select table tr td { padding:5px; }
 #kiwi.theme_relaxed .server_select button { float:right; padding:3px 7px; }
@@ -575,6 +589,7 @@ html, body { height:100%; }
 #kiwi.theme_relaxed .server_select .basic input { width:170px; }
 #kiwi.theme_relaxed .server_select .basic label { font-size:1.3em; margin-top:4px; }
 #kiwi.theme_relaxed .server_select .basic tr.have_pass { font-size:0.8em; }
+#kiwi.theme_relaxed .server_select .basic tr.have_key { font-size:0.8em; }
 #kiwi.theme_relaxed .server_select .basic tr.channel td { padding-top:1em; }
 #kiwi.theme_relaxed .server_select .basic { border-bottom: 1px dashed gray; margin-bottom:1em; }
 #kiwi.theme_relaxed .server_select .basic .show_more { display: block; width:110px; margin:10px 0 0 0; font-size:0.8em; background: url(../img/more.png) no-repeat right 7px; }
@@ -587,23 +602,23 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_relaxed .server_select .kiwi_logo { text-align: center; display:block; }
-#kiwi.theme_relaxed .server_select .kiwi_logo h1 {
-    font-size:20px;
-    line-height:48px; vertical-align: middle;
+#kiwi.theme_relaxed .server_select .kiwi_logo { margin-top:30px; }
+#kiwi.theme_relaxed .server_select .kiwi_logo h1 span {
+    font-size:14px;
+    line-height:24px; vertical-align: middle;
     color: #555555;
 }
-#kiwi.theme_relaxed .server_select .kiwi_logo img { }
+#kiwi.theme_relaxed .server_select .kiwi_logo img { display:inline; width:24px; }
 
 
 #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 #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 {
+#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 {
     margin-right:0;
     border-right-width:0;
     border-bottom-right-radius:0;
@@ -668,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;
     
@@ -688,32 +703,32 @@ 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; }
-#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 {
+#kiwi.theme_mini .status_message {
     background: #FEEFB3; color: #9F6000;
     border-bottom: 1px solid;
     padding: 0.9em;
     text-align: center; font-size:1.1em;
 }
-#kiwi.theme_mini #status_message.err { color:#D8000C; background:#FFBABA; }
+#kiwi.theme_mini .status_message.err { color:#D8000C; background:#FFBABA; }
 
 #kiwi.theme_mini .messages { color: #333333; }
 #kiwi.theme_mini .messages.active { }
@@ -806,8 +821,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_mini #topic { display:none; }
-#kiwi.theme_mini #topic div {
+#kiwi.theme_mini .toolbar .topic { display:none; }
+#kiwi.theme_mini .toolbar .topic div {
     top:2; bottom:2px; left:0; width:100%;
     padding: 0.2em 1em;
     text-align: center;
@@ -820,22 +835,22 @@ 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 */
 #kiwi.theme_mini .server_select { padding:3em 0 2em 0; margin: 0 auto; width:100%; }
 #kiwi.theme_mini .server_select .more { display:none; }
-#kiwi.theme_mini .server_select button { display:block; padding:3px 7px; margin:0 auto; }
+#kiwi.theme_mini .server_select button { display:block; padding:3px 7px; margin:1em auto; }
 #kiwi.theme_mini .server_select input.nick {
     float:none; display:block; width:80%;
     padding:0.5em 1em; margin:0 auto;
@@ -848,6 +863,8 @@ html, body { height:100%; }
 #kiwi.theme_mini .server_select .basic table tr.channel,
 #kiwi.theme_mini .server_select .basic table tr.pass,
 #kiwi.theme_mini .server_select .basic table tr.have_pass { display:none; }
+#kiwi.theme_mini .server_select .basic table tr.key,
+#kiwi.theme_mini .server_select .basic table tr.have_key { display:none; }
 #kiwi.theme_mini .server_select .basic .show_more { display:none !important; }
 #kiwi.theme_mini .server_select.single_server .basic { border:none; }
 #kiwi.theme_mini .server_select .status { text-align: center; font-weight: bold; padding:1em; }
@@ -857,9 +874,13 @@ html, body { height:100%; }
     padding:0.5em; margin-top:1em; margin-bottom:1em; margin-right:2em;
 }
 
-#kiwi.theme_mini .server_select .divider-verticle {
-    display:none;
+#kiwi.theme_mini .server_select .kiwi_logo h1 span {
+    font-size:14px;
+    line-height:24px; vertical-align: middle;
+    color: #555555;
 }
+#kiwi.theme_mini .server_select .kiwi_logo img { display:inline; width:24px; }
+
 #kiwi.theme_mini .server_select .server_details {
     position: relative !important;
     float: none !important;
@@ -867,8 +888,6 @@ html, body { height:100%; }
     padding: 0 !important;
     margin: 2em 0 0 0 !important;
 }
-#kiwi.theme_mini .server_select .about_kiwi { display:none; }
-
 
 
 
@@ -912,8 +931,8 @@ html, body { height:100%; }
     padding-left:0.5em;
 }
 
-#kiwi.theme_cli #topic { background:#111111; height:2em; border-bottom:1px solid #444444; border-top:1px solid #444444; }
-#kiwi.theme_cli #topic div {
+#kiwi.theme_cli .toolbar .topic { background:#111111; height:2em; border-bottom:1px solid #444444; border-top:1px solid #444444; }
+#kiwi.theme_cli .toolbar .topic div {
     width:100%; height: 1.5em;
     padding: 0.2em 1em;
     text-align: center;
@@ -922,7 +941,7 @@ html, body { height:100%; }
     overflow: hidden;
     white-space: nowrap;
 }
-#kiwi.theme_cli #topic:hover div {
+#kiwi.theme_cli .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -932,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;
     
@@ -951,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; }
-#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;
 }
 
@@ -1058,7 +1077,7 @@ html, body { height:100%; }
 
 
 /* The server select dialog */
-#kiwi.theme_cli .server_select { width:730px;  padding:3em 0 2em 0; margin: 0 auto; }
+#kiwi.theme_cli .server_select { margin-left:auto; margin-right:auto; color:#eee; }
 #kiwi.theme_cli .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_cli .server_select table tr td { padding:5px; }
 #kiwi.theme_cli .server_select button { float:right; padding:3px 7px; margin-top:10px; }
@@ -1080,14 +1099,16 @@ html, body { height:100%; }
     padding:0.5em; margin-top:1em; margin-bottom:1em; margin-right:2em;
 }
 
+#kiwi.theme_cli .server_select .basic tr.channel .icon-key { color:#555; }
+
 
-#kiwi.theme_cli .server_select .kiwi_logo { text-align: center; display:block; }
+#kiwi.theme_cli .server_select .kiwi_logo { margin-top:30px; text-align:center; display:block; }
 #kiwi.theme_cli .server_select .kiwi_logo h1 {
     font-size:20px;
     line-height:48px; vertical-align: middle;
-    color: #555555;
+    color: #bbb;
 }
-#kiwi.theme_cli .server_select .kiwi_logo img { }
+#kiwi.theme_cli .server_select .kiwi_logo img { display:inline; width:24px; }
 
 
 #kiwi.theme_cli .divider-verticle {
@@ -1103,13 +1124,13 @@ 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 #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; }
+#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; }
 
 
 #kiwi.theme_cli .ui_menu {
@@ -1137,7 +1158,7 @@ html, body { height:100%; }
  * Basic theme
  */
 #kiwi.theme_basic {
-    background: #FFF;
+    background: url(../img/background-light.png) left top repeat-x #E3E3E3;
     color: #555555;
 }
 #kiwi.theme_basic,
@@ -1152,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;
+    /*display:none; width:0;*/
 }
-#kiwi.theme_basic #toolbar .panellist li {
+#kiwi.theme_basic .toolbar .panellist li {
     line-height: 1.4em;
     vertical-align: middle;
     
@@ -1172,31 +1193,34 @@ 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; }
-#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 { }
 
 /* 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 {
+#kiwi.theme_basic .status_message {
     background: #FEEFB3; color: #9F6000;
     border-bottom: 1px solid;
     padding: 0.9em;
     text-align: center; font-size:1.1em;
 }
-#kiwi.theme_basic #status_message.err { color:#D8000C; background:#FFBABA; }
+#kiwi.theme_basic .status_message.err { color:#D8000C; background:#FFBABA; }
 
 #kiwi.theme_basic .messages {  }
 #kiwi.theme_basic .messages.active { }
@@ -1205,7 +1229,7 @@ html, body { height:100%; }
 #kiwi.theme_basic .messages .msg { }
 #kiwi.theme_basic .messages .msg > div { font-family: Consolas, "Lucida Console", monospace; font-size:0.9em; }
 #kiwi.theme_basic .messages .msg { border: none; }
-#kiwi.theme_basic .messages .msg .time { display:inline; margin-right:1em; margin-left:2px; color:gray; }
+#kiwi.theme_basic .messages .msg .time { display:none; margin-right:1em; margin-left:2px; color:gray; }
 #kiwi.theme_basic .messages .msg .nick { display:inline; margin-right:1em; }
 #kiwi.theme_basic .messages .msg .nick:before { content:"<"; }
 #kiwi.theme_basic .messages .msg .nick:after { content:">"; }
@@ -1231,9 +1255,49 @@ html, body { height:100%; }
     padding:0.5em; margin-top:1em; margin-bottom:1em; margin-right:2em;
 }
 
+#kiwi.theme_basic.timestamps .messages .msg .time { display:inline; }
+#kiwi.theme_basic.timestamps .messages .msg .text { }
+
 #kiwi.theme_basic .messages .msg.global_nick_highlight,
 #kiwi.theme_basic .messages .msg.highlight { background:#D9D9D9; }
 
+/* Narrow styling (window width < 400px) */
+#kiwi.theme_basic.narrow .messages .msg .nick { width: auto; }
+#kiwi.theme_basic.narrow .messages .msg .text { margin-left: 1em; border:none; }
+#kiwi.theme_basic.narrow .messages .msg.action .text { margin-left: 1em; }
+
+#kiwi.theme_basic .messages .msg .media { margin-left:0.5em; }
+#kiwi.theme_basic .messages .msg .media a { text-decoration:none; }
+#kiwi.theme_basic .messages .msg .media .media_close { font-size:0.9em; }
+#kiwi.theme_basic .messages .msg .media .media_content { margin:10px 0 0 2em; overflow:hidden; }
+#kiwi.theme_basic .messages .msg .media .media_content img { padding:3px; border:1px solid gray; }
+#kiwi.theme_basic .messages .msg .media .media_content > .content {
+    background: white;
+    overflow: hidden;
+    padding: 10px;
+    border: #DDD 1px solid;
+    border-top-color: #EEE;
+    border-bottom-color: #BBB;
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+    -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.15);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+    border-radius: 5px;
+    float: left;
+}
+
+#kiwi.theme_basic .messages .msg .media.twitter .media_content > .content {
+    background: transparent;
+    border:none;
+    overflow: hidden;
+    box-shadow: none;
+    padding: 0;
+}
+#kiwi.theme_basic .messages .msg .media.reddit .thumbnail_nsfw {
+    display: inline-block;
+    float: left;
+}
+#kiwi.theme_basic .messages .msg .media.reddit .thumbnail { float:left; margin-right: 0.5em; }
+
 
 
 #kiwi.theme_basic #memberlists {
@@ -1280,6 +1344,7 @@ html, body { height:100%; }
     position:relative;
     height:100%; width:100%;
     display: block;
+    outline: none;
 }
 
 
@@ -1292,8 +1357,8 @@ html, body { height:100%; }
 
 
 
-#kiwi.theme_basic #topic {  }
-#kiwi.theme_basic #topic div {
+#kiwi.theme_basic .toolbar .topic {  }
+#kiwi.theme_basic .toolbar .topic div {
     top:2; bottom:2px; left:0; width:100%;
     padding: 0.2em 1em;
     text-align: center;
@@ -1304,7 +1369,7 @@ html, body { height:100%; }
     overflow: hidden;
     outline: none;
 }
-#kiwi.theme_basic #topic:hover div {
+#kiwi.theme_basic .toolbar .topic:hover div {
     min-height:1.5em;
     white-space:pre-wrap; word-wrap:break-word;
     overflow:visible;
@@ -1315,20 +1380,20 @@ 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 */
-#kiwi.theme_basic .server_select { width:730px;  padding:3em 0 2em 0; margin: 0 auto; }
+#kiwi.theme_basic .server_select { margin-left:auto; margin-right:auto; }
 #kiwi.theme_basic .server_select a { text-decoration: none; }
 #kiwi.theme_basic .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_basic .server_select table tr td { padding:5px; }
@@ -1352,23 +1417,23 @@ html, body { height:100%; }
 }
 
 
-#kiwi.theme_basic .server_select .kiwi_logo { text-align: center; display:block; }
+#kiwi.theme_basic .server_select .kiwi_logo { margin-top:30px; text-align:center; display:block; }
 #kiwi.theme_basic .server_select .kiwi_logo h1 {
-    font-size:20px;
+    font-size:14px;
     line-height:48px; vertical-align: middle;
     color: #555555;
 }
-#kiwi.theme_basic .server_select .kiwi_logo img { }
+#kiwi.theme_basic .server_select .kiwi_logo img { display:inline; width:24px; }
 
 
 #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 #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 {
+#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 {
     margin-right:0;
     border-right-width:0;
     border-bottom-right-radius:0;
@@ -1377,4 +1442,4 @@ html, body { height:100%; }
 
 
 #kiwi.theme_basic .ui_menu .ui_menu_foot .close { float:right; font-size:0.9em; margin-right:1em; color: #999; }
-#kiwi.theme_basic .ui_menu .ui_menu_foot .close:hover { color: #222; }
\ No newline at end of file
+#kiwi.theme_basic .ui_menu .ui_menu_foot .close:hover { color: #222; }