summaryrefslogtreecommitdiff
path: root/app/views/layouts/application.html.haml
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-02 23:19:38 -0700
committerelijah <elijah@riseup.net>2013-07-02 23:19:38 -0700
commitfcd9c579866e7d17891c4d1426ef7f230d16f1c5 (patch)
tree2a849dea556c4e66e73e21ab97482f7cd55b90df /app/views/layouts/application.html.haml
parent96206389a863f105bd0b37dcdb9d00b7c30d8b51 (diff)
cleaned up application layout and some minor css.
Diffstat (limited to 'app/views/layouts/application.html.haml')
-rw-r--r--app/views/layouts/application.html.haml14
1 files changed, 3 insertions, 11 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e185f26..db612b7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,3 +1,4 @@
+- @show_navigation = true if @show_navigation.nil?
!!!
%html
%head
@@ -20,16 +21,7 @@
.row-fluid
.span12
= render 'layouts/header'
- .row-fluid
- .span2
- = render 'layouts/navigation'
- .span10
- = render 'layouts/messages'
- = yield
- - else
- .row-fluid
- .span12
- = render 'layouts/messages'
- = yield
+ .row-fluid
+ = render 'layouts/content'
#footer
= render 'layouts/footer'