From 1174c33f92058d204c801ba62e1cceee82692cc4 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Thu, 25 Apr 2013 14:16:28 +0200
Subject: moved some elements in the navbar and deleted styles.less

---
 views/navbar.ejs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'views/navbar.ejs')

diff --git a/views/navbar.ejs b/views/navbar.ejs
index 5d87ae4..e0ea1ab 100644
--- a/views/navbar.ejs
+++ b/views/navbar.ejs
@@ -38,25 +38,26 @@
                 </div>
                 <% } %>
                 <div class="row">
-                    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target="nav-collapse">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
                     <img class="logo" src="/img/dividlogo.png" href="#">
                     <!--<a class="brand" href="#">Divid</a>--!>
+                    <div class="pull-right">
+                        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                        </button>
+                        <% if(!loggedin) { %><a class="brand login" data-toggle="collapse" data-target=".login-collapse" href="#login">Logg inn</a>
+                        <% } else { %><a href="/logout" class="brand login">Logg ut</a>
+                        <% } %>
+                    </div>
                     <div class="nav-collapse collapse">
                         <ul class="nav menu">
                             <li><a href="#signup">Registrer</a></li>
                             <li><a href="#kontakt">Kontakt</a></li>
-							<li><a href="#dashboard">Dashboard</a></li>
-                               
+                            <li><a href="#dashboard">Dashboard</a></li>
                         </ul>
                     </div>
-                    <% if(!loggedin) { %><a class="brand login" data-toggle="collapse" data-target=".login-collapse" href="#login">Logg inn</a>
-                    <% } else { %><a href="/logout" class="brand login">Logg ut</a>
-                    <% } %>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3