From d567cb16afd311e07274639fecac6cdc499d86ef Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 16 Sep 2012 12:19:56 +0100 Subject: [PATCH] Theme can now change anything within #kiwi --- client_backbone/dev/applet_settings.js | 8 ++--- client_backbone/style.css | 42 +++++++++++++------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/client_backbone/dev/applet_settings.js b/client_backbone/dev/applet_settings.js index 1edad21..6b97d0f 100644 --- a/client_backbone/dev/applet_settings.js +++ b/client_backbone/dev/applet_settings.js @@ -9,15 +9,14 @@ }, saveSettings: function () { - var theme = $('.theme', this.$el).val(), - containers = $('#panels > .panel_container'); + var theme = $('.theme', this.$el).val(); // Clear any current theme - containers.removeClass(function (i, css) { + kiwi.app.view.$el.removeClass(function (i, css) { return (css.match (/\btheme_\S+/g) || []).join(' '); }); - if (theme) containers.addClass('theme_' + theme); + if (theme) kiwi.app.view.$el.addClass('theme_' + theme); } }); @@ -27,7 +26,6 @@ initialize: function () { this.set('title', 'Settings'); this.view = new View(); - window.s = this; } }); })(); \ No newline at end of file diff --git a/client_backbone/style.css b/client_backbone/style.css index df54b5d..dcc28fe 100644 --- a/client_backbone/style.css +++ b/client_backbone/style.css @@ -202,27 +202,27 @@ body { /* Relaxed theme */ -.panel_container.theme_relaxed .messages .msg { border-bottom: 1px solid #DEDEDE; font-family:arial; font-size:0.9em; } -.panel_container.theme_relaxed .messages .msg .time { width:6em; float:left; color:#777; display:none; } -.panel_container.theme_relaxed .messages .msg .nick { width:11em; float:left; font-size:12px; font-family:Arial; text-align:left; padding: 5px; } -.panel_container.theme_relaxed .messages .msg .text { margin-left:12em; border-left: 1px solid #DEDEDE; white-space:pre-wrap; word-wrap:break-word; font-family:Arial; padding:5px; } - -.panel_container.theme_relaxed .messages .msg.action .nick { display:none; } -.panel_container.theme_relaxed .messages .msg.action .text { margin-left:9em; color:#009900; border-left:none; font-style:italic; } -.panel_container.theme_relaxed .messages .msg.action.join { color:#009900; } -.panel_container.theme_relaxed .messages .msg.action.part .text { color:#900; } -.panel_container.theme_relaxed .messages .msg.action.quit .text { color:#900; } -.panel_container.theme_relaxed .messages .msg.action.kick .text { color:#900; } -.panel_container.theme_relaxed .messages .msg.status .nick { display:none; } -.panel_container.theme_relaxed .messages .msg.status .text { color:#990000; margin-left:9em; border-left:none; font-weight:bold; } -.panel_container.theme_relaxed .messages .msg.topic .nick { display:none; } -.panel_container.theme_relaxed .messages .msg.topic .text { color:#009900; margin-left:9em; font-style: italic; border-left:none; } -/*.panel_container.theme_relaxed .messages .msg.motd .nick { display:none; }*/ -.panel_container.theme_relaxed .messages .msg.motd { border:none; } -.panel_container.theme_relaxed .messages .msg.motd .text { color:#666; } -.panel_container.theme_relaxed .messages .msg.whois .nick { font-weight:normal; } -.panel_container.theme_relaxed .messages .msg.whois .text { margin-left:18em; padding-left:1em; border-left:1px dashed #999; } -.panel_container.theme_relaxed .messages .msg.error .text { +#kiwi.theme_relaxed .messages .msg { border-bottom: 1px solid #DEDEDE; font-family:arial; font-size:0.9em; } +#kiwi.theme_relaxed .messages .msg .time { width:6em; float:left; color:#777; display:none; } +#kiwi.theme_relaxed .messages .msg .nick { width:11em; float:left; font-size:12px; font-family:Arial; text-align:left; padding: 5px; } +#kiwi.theme_relaxed .messages .msg .text { margin-left:12em; border-left: 1px solid #DEDEDE; white-space:pre-wrap; word-wrap:break-word; font-family:Arial; padding:5px; } + +#kiwi.theme_relaxed .messages .msg.action .nick { display:none; } +#kiwi.theme_relaxed .messages .msg.action .text { margin-left:9em; color:#009900; border-left:none; font-style:italic; } +#kiwi.theme_relaxed .messages .msg.action.join { color:#009900; } +#kiwi.theme_relaxed .messages .msg.action.part .text { color:#900; } +#kiwi.theme_relaxed .messages .msg.action.quit .text { color:#900; } +#kiwi.theme_relaxed .messages .msg.action.kick .text { color:#900; } +#kiwi.theme_relaxed .messages .msg.status .nick { display:none; } +#kiwi.theme_relaxed .messages .msg.status .text { color:#990000; margin-left:9em; border-left:none; font-weight:bold; } +#kiwi.theme_relaxed .messages .msg.topic .nick { display:none; } +#kiwi.theme_relaxed .messages .msg.topic .text { color:#009900; margin-left:9em; font-style: italic; border-left:none; } +/*#kiwi.theme_relaxed .messages .msg.motd .nick { display:none; }*/ +#kiwi.theme_relaxed .messages .msg.motd { border:none; } +#kiwi.theme_relaxed .messages .msg.motd .text { color:#666; } +#kiwi.theme_relaxed .messages .msg.whois .nick { font-weight:normal; } +#kiwi.theme_relaxed .messages .msg.whois .text { margin-left:18em; padding-left:1em; border-left:1px dashed #999; } +#kiwi.theme_relaxed .messages .msg.error .text { border:1px solid #A33F3F; background-color:#D28A8A; padding:0.5em; margin-top:1em; margin-bottom:1em; margin-right:2em; } \ No newline at end of file -- 2.25.1