diff options
| author | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
| commit | fb791b200ee4da1b6a2f4e3121cb26196e28c953 (patch) | |
| tree | d71fa9065faec5f1bb584e18e45583b393bcd429 /app | |
| parent | 13f53593551549d8e95e382fd42a92efc170943d (diff) | |
| parent | ec87ccfa185a4c063386d385de7af15f993b77d8 (diff) | |
Merge branch 'feature/error-messages-on-login' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index e72586a..b75eed7 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,7 +1,6 @@ = link_to "Leap Web", root_path, :class => 'brand' -.nav-collapse.collapse - %ul.nav - // = render '/tickets/nav' +%ul.nav + // = render '/tickets/nav' - %ul.nav.pull-right - = render '/sessions/nav' +%ul.nav.pull-right + = render '/sessions/nav' |