Client: Mini theme now in theme selection

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index 0c8d619acd1bdb35ae961154147aa37a05312689..fbe29496907b5637fdc068a9a8c6ab15e8f206c4 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -74,7 +74,7 @@
     <script type="text/html" id="tmpl_server_select">\r
         <div class="server_select">\r
 \r
-            <div style="position:relative;float:left;width:320px;padding-right:3em;margin-top:50px;">\r
+            <div class="server_details" style="position:relative;float:left;width:320px;padding-right:3em;margin-top:50px;">\r
                 <div class="status">Think of a nickname..</div>\r
 \r
                 <form>\r
@@ -105,7 +105,7 @@
                 <div class="divider-verticle"></div>\r
             </div>\r
 \r
-            <div style="position:relative;float:left;width:320px;margin-left:3em;color:#555555;">\r
+            <div class="about_kiwi" style="position:relative;float:left;width:320px;margin-left:3em;color:#555555;">\r
                 <a class="kiwi_logo" href="http://www.kiwiirc.com/" target="_blank">\r
                     <img src="<%base_path%>/assets/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> <br />\r
                     <h1>Powered by Kiwi IRC</h1>\r
@@ -125,8 +125,8 @@
                     <td>Theme</td>\r
                     <td>\r
                         <select class="setting-theme">\r
-                            <option value="default">Default</option>\r
                             <option value="relaxed">Relaxed</option>\r
+                            <option value="mini">Mini</option>\r
                             <option value="cli">CLI</option>\r
                         </select>\r
                     </td>\r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index 61cd96d3d5389a255d432035c6b58c967148bcd4..cb67ad081d716ea75aff42640439a53a8f32ff5a 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -1006,7 +1006,7 @@ _kiwi.view.Application = Backbone.View.extend({
 \r
         // Clear any current theme\r
         this.$el.removeClass(function (i, css) {\r
-            return (css.match (/\btheme_\S+/g) || []).join(' ');\r
+            return (css.match(/\btheme_\S+/g) || []).join(' ');\r
         });\r
 \r
         // Apply the new theme\r