diff options
| author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-25 14:16:28 +0200 |
|---|---|---|
| committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-25 14:16:28 +0200 |
| commit | 1174c33f92058d204c801ba62e1cceee82692cc4 (patch) | |
| tree | 481ba0ff5859f3f60a4144b521faf4ccb62e5f9f /views/navbar.ejs | |
| parent | changed navbarCollapseWidth (diff) | |
| download | Divid-1174c33f92058d204c801ba62e1cceee82692cc4.tar.gz | |
moved some elements in the navbar and deleted styles.less
Diffstat (limited to 'views/navbar.ejs')
| -rw-r--r-- | views/navbar.ejs | 23 |
1 files changed, 12 insertions, 11 deletions
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> |