summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-20 10:34:13 +0100
committerAzul <azul@leap.se>2012-11-20 10:34:13 +0100
commit60bb7b4522148d4c426ff2073bf54beefa4041d4 (patch)
treeb8d3cf7ad7ecbac34a4af9857515c10be752f847
parent347eb4b20cbe740485dd9d1d7220c01eef659920 (diff)
ui tweaks to the menu
-rw-r--r--app/assets/stylesheets/application.scss3
-rw-r--r--app/views/layouts/_navigation.html.haml9
-rw-r--r--users/app/views/sessions/_nav.html.haml4
3 files changed, 11 insertions, 5 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 72c943a..3465431 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,2 +1,5 @@
@import "bootstrap";
+body {
+ padding: 40px;
+}
@import "bootstrap-responsive";
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index b75eed7..e72586a 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,7 @@
= link_to "Leap Web", root_path, :class => 'brand'
-%ul.nav
- // = render '/tickets/nav'
+.nav-collapse.collapse
+ %ul.nav
+ // = render '/tickets/nav'
-%ul.nav.pull-right
- = render '/sessions/nav'
+ %ul.nav.pull-right
+ = render '/sessions/nav'
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index 204ba88..b738504 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,8 +1,10 @@
- if logged_in?
%li
= 'logged in as ' + current_user.login
+ %li
= link_to t(:logout), logout_path
- - if admin?
+ - if admin?
+ %li
= 'ADMIN' # obviously not like this
- else
%li