From 9a10cedeaeebb62a075c190d6296070fc3d594b2 Mon Sep 17 00:00:00 2001 From: Darren Date: Sat, 12 Jul 2014 01:44:02 +0100 Subject: [PATCH] Channel topic more prominent --- client/assets/themes/basic/style.css | 3 +++ client/assets/themes/mini/style.css | 4 +++- client/assets/themes/relaxed/style.css | 4 +++- client/src/views/channel.js | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/assets/themes/basic/style.css b/client/assets/themes/basic/style.css index 795567e..b067cad 100644 --- a/client/assets/themes/basic/style.css +++ b/client/assets/themes/basic/style.css @@ -110,7 +110,10 @@ #kiwi .messages .msg.action .nick, #kiwi .messages .msg.static .nick, +#kiwi .messages .msg.topic { margin: 5px; background: #FFF5AB; border: 1px solid #F3C572; border-radius: 5px; } +#kiwi .messages .msg.topic .time { display:none; } #kiwi .messages .msg.topic .nick { display:none; } +#kiwi .messages .msg.topic .text { color:#009900; margin-left:0; font-style: italic; border:none; } #kiwi .messages .msg.action .text { color:#009900; font-style:italic; } #kiwi .messages .msg.action.join { color:#009900; } diff --git a/client/assets/themes/mini/style.css b/client/assets/themes/mini/style.css index 6ebb340..ef965d8 100644 --- a/client/assets/themes/mini/style.css +++ b/client/assets/themes/mini/style.css @@ -112,8 +112,10 @@ #kiwi .messages .msg.action.kick .text { color:#900; } #kiwi .messages .msg.status .nick { } #kiwi .messages .msg.status .text { color:#990000; border-left:none; font-weight:bold; } +#kiwi .messages .msg.topic { margin: 10px; background: #FFF5AB; border: 1px solid #F3C572; border-radius: 5px; } +#kiwi .messages .msg.topic .time { display:none; } #kiwi .messages .msg.topic .nick { display:none; } -#kiwi .messages .msg.topic .text { color:#009900; font-style: italic; border-left:none; } +#kiwi .messages .msg.topic .text { color:#009900; margin-left:0; font-style: italic; border:none; } #kiwi .messages .msg.motd { border:none; } /*#kiwi .messages .msg.motd .nick { display:none; }*/ #kiwi .messages .msg.motd .text { color:#666; } diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css index 58cdf81..4a4f55d 100644 --- a/client/assets/themes/relaxed/style.css +++ b/client/assets/themes/relaxed/style.css @@ -125,8 +125,10 @@ #kiwi .messages .msg.action.kick .text { color:#900; } #kiwi .messages .msg.status .nick { } #kiwi .messages .msg.status .text { color:#990000; margin-left:9em; border-left:none; font-weight:bold; } +#kiwi .messages .msg.topic { margin: 10px; background: #FFF5AB; border: 1px solid #F3C572; border-radius: 5px; } +#kiwi .messages .msg.topic .time { display:none; } #kiwi .messages .msg.topic .nick { display:none; } -#kiwi .messages .msg.topic .text { color:#009900; margin-left:9em; font-style: italic; border-left:none; } +#kiwi .messages .msg.topic .text { color:#009900; margin-left:0; font-style: italic; border:none; } #kiwi .messages .msg.motd { border:none; } /*#kiwi .messages .msg.motd .nick { display:none; }*/ #kiwi .messages .msg.motd .text { color:#666; font-family:monospace; } diff --git a/client/src/views/channel.js b/client/src/views/channel.js index 347d562..b73ad2a 100644 --- a/client/src/views/channel.js +++ b/client/src/views/channel.js @@ -319,7 +319,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({ topic = this.model.get("topic"); } - this.model.addMsg('', styleText('channel_topic', {text: translateText('client_views_channel_topic', [this.model.get('name'), topic]), channel: this.model.get('name')}), 'topic'); + this.model.addMsg('', styleText('channel_topic', {text: topic, channel: this.model.get('name')}), 'topic'); // If this is the active channel then update the topic bar if (_kiwi.app.panels().active === this) { -- 2.25.1