summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-20 10:34:13 +0100
committerAzul <azul@leap.se>2012-11-20 10:35:10 +0100
commit13f53593551549d8e95e382fd42a92efc170943d (patch)
treeac8ece0f627ac76a9c407a022878649e21376291 /app
parentcd743d686ade50a9b23965a99c57b8105e834ec9 (diff)
ui tweaks to the menu
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/application.scss3
-rw-r--r--app/views/layouts/_navigation.html.haml9
2 files changed, 8 insertions, 4 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'