From d5f76c728252e91ca7d6f562b5e93167ad581e22 Mon Sep 17 00:00:00 2001
From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 24 Mar 2013 19:42:56 -0400
Subject: [PATCH] Configure the nav for mobile.

---
 xonstat/static/css/app.css | 18 ++++++++++++++++++
 xonstat/templates/nav.mako | 27 ++++++++++++++-------------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/xonstat/static/css/app.css b/xonstat/static/css/app.css
index 7356638..5c68f32 100644
--- a/xonstat/static/css/app.css
+++ b/xonstat/static/css/app.css
@@ -1,3 +1,16 @@
+/* Fonts */
+@font-face {
+    font-family: 'XoloniumNormal';
+    src: url('fonts/xolonium-webfont.eot');
+    src: url('fonts/xolonium-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/xolonium-webfont.woff') format('woff'),
+         url('fonts/xolonium-webfont.ttf') format('truetype'),
+         url('fonts/xolonium-webfont.svg#XoloniumNormal') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+
 /* Primary elements */
 body {
     background: url("img/web_background_4.jpg") no-repeat fixed center center / cover  black;
@@ -6,8 +19,10 @@ body {
 
 /* Navigation bar */
 .navbar-brand {
+    margin-left: 0;
     padding-bottom: 0px;
     padding-top: 10px;
+    text-align: left;
 }
 .navbar-inverse {
     background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
@@ -15,6 +30,9 @@ body {
 .navbar-inverse .nav>.active>a, .navbar-inverse .nav>.active>a:hover, .navbar-inverse .nav>.active>a:focus {
     background: none repeat scroll 0 0 rgba(49, 49, 49, 0.6);
 }
+.navbar-inverse .nav>li>a, .navbar-brand {
+    font-family: XoloniumNormal;
+}
 .search, input[type="search"] {
     background-color: #606060;
     border: 1px solid #202020;
diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
index 81823e1..bcfba35 100644
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -2,15 +2,16 @@
     <div class="navbar navbar-inverse navbar-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+          <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>
           <a class="navbar-brand" href="${request.route_url('main_index')}">
            <img src="/static/css/img/Xonotic_icon.png" />
+           XonStat
           </a>
-          <div class="nav-collapse collapse">
+          <nav class="nav-main nav-collapse in collapse" role="navigation" style="height: auto;">
             <ul class="nav">
               <li 
                 % if active=="leaderboard":
@@ -38,18 +39,18 @@
                 % endif
                 ><a href="${request.route_url('map_index')}" title="Map Index">Maps</a></li>
             </ul>
-          </div>
 
-          <form class="navbar-form pull-right" action="${request.route_url('search')}" method="get">
-            <input type="hidden" name="fs" />
-            <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>
+            <form class="navbar-form pull-right" action="${request.route_url('search')}" method="get">
+              <input type="hidden" name="fs" />
+              <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>
+          </nav>
 
         </div>
       </div>
-- 
2.39.2