From: Darren Date: Sun, 19 May 2013 18:08:01 +0000 (+0100) Subject: #status_message now .status_message X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=707593d22d5143fc1f57834eb0f432e10aea35c4;p=KiwiIRC.git #status_message now .status_message --- diff --git a/client/assets/css/style.css b/client/assets/css/style.css index 868105c..176d0c8 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -55,7 +55,7 @@ html, body { height:100%; } #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; @@ -376,13 +376,13 @@ html, body { height:100%; } 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 { } @@ -722,13 +722,13 @@ html, body { height:100%; } #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 { } @@ -1214,13 +1214,13 @@ html, body { height:100%; } #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 { } diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl index edb0e1d..339f1f5 100644 --- a/client/assets/dev/index.html.tmpl +++ b/client/assets/dev/index.html.tmpl @@ -29,7 +29,7 @@
-
+
diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js index 7dd3cdc..dce6d64 100644 --- a/client/assets/dev/model_application.js +++ b/client/assets/dev/model_application.js @@ -121,7 +121,7 @@ _kiwi.model.Application = function () { new _kiwi.view.AppToolbar({el: _kiwi.app.view.$el.find('.toolbar .app_tools')[0]}); - this.message = new _kiwi.view.StatusMessage({el: $('#status_message')[0]}); + this.message = new _kiwi.view.StatusMessage({el: this.view.$el.find('.status_message')[0]}); this.resize_handle = new _kiwi.view.ResizeHandler({el: $('#memberlists_resize_handle')[0]});