Move search over to the right if size permits.

[xonotic/xonstat.git] / xonstat / templates / nav.mako

diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
index 57eab80b025cdfd9f7da1abdae7f2490fab98661..cb0082a7fcc5ec8821bca7f5bae681b622f53bff 100644 (file)
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -1,19 +1,17 @@
 <%def name="nav(active)">
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-inverse navbar-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+          <a class="navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
-          <header>
-            <a class="brand" href="${request.route_url('main_index')}">
-             <img src="/static/css/img/Xonotic_icon.png" /><h1>Xonotic Game Statistics</h1>
-            </a>
-            <h2>Xonotic is a fast-paced open-source GPL first person shooter</h2>
-          </header>
-          <div class="nav-collapse">
+          <a class="navbar-brand" href="${request.route_url('main_index')}">
+           <img src="/static/css/img/Xonotic_icon.png" />
+           XonStat
+          </a>
+          <nav class="nav-main nav-collapse in collapse" role="navigation" style="height: auto;">
             <ul class="nav">
               <li 
                 % if active=="leaderboard":
@@ -41,17 +39,19 @@
                 % endif
                 ><a href="${request.route_url('map_index')}" title="Map Index">Maps</a></li>
             </ul>
-            <form id="navsearch" action="${request.route_url('search')}" method="get">
+
+            <form class="navbar-form pull-left" action="${request.route_url('search')}" method="get">
               <input type="hidden" name="fs" />
-              <input type="search" class="input-small" placeholder="search" name="sval"/>
-              <select name="stype">
+              <input type="search" class="input-small search" placeholder="search" name="sval"/>
+              <select class="search" name="stype">
                 <option>players</option>
                 <option>servers</option>
                 <option>maps</option>
               </select>
             [<a href="${request.route_url('search')}" title="Advanced search">+</a>]
             </form>
-          </div><!--/.nav-collapse -->
+          </nav>
+
         </div>
       </div>
     </div>