Move theme selector to sidebar

diff --git a/js/90-themes.js b/js/90-themes.js
index 5ec968a4552821ba55119ec759b007f5057d0826..eb5987c76041a5d720bc9787302c3120122ccc42 100644 (file)
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@ -6,6 +6,7 @@
        }
 
        $( document ).ready(function() {
+               $('#theme-selector').detach().prependTo($('#sidebar'));
                $('#theme_slate'   ).on('click', function () { set_style("slate"); });
                $('#theme_cerulean').on('click', function () { set_style("cerulean"); });
                $('#theme_cyborg'  ).on('click', function () { set_style("cyborg"); });

diff --git a/tmpl/skel.en b/tmpl/skel.en
index de00cd827b89337dc0123bf3285ab537596769b4..e6ac878c374a8fd988fd448e46bd79d125e7c641 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -17,13 +17,6 @@
 <li id="nav-us"><a href="/us/">Users</a>
 <li id="nav-account"><a href="/account">Account</a>
 <li id="nav-contribute"><a href="/contribute">Contribute!</a>
-<li id="theme-selector" class="reqjs"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
-<ul class="dropdown-menu" role="menu">
-<li><a href="#" id="theme_slate">Gunmetal gray</a>
-<li><a href="#" id="theme_cyborg">Black</a>
-<li><a href="#" id="theme_cerulean">White</a>
-<li><a href="#" id="theme_cosmo">Metro</a>
-</ul>
 
 </ul>
 </div>
@@ -38,6 +31,16 @@
 
 <div id="login" class="reqjs"><a href="/login">Log in</a></div>
 
+<div id="theme-selector" class="reqjs">
+Themes:
+<ul class="list-inline">
+<li><a href="#" id="theme_slate">Gray</a>
+<li><a href="#" id="theme_cyborg">Black</a>
+<li><a href="#" id="theme_cerulean">White</a>
+<li><a href="#" id="theme_cosmo">Metro</a>
+</ul>
+</div>
+
 <div id="tracker" class="reqjs">
 <h3>Track user</h3>
 <div id="tracker_form">