diff options
| author | elijah <elijah@riseup.net> | 2013-07-02 23:19:38 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-04 04:12:59 -0700 |
| commit | b8c44acfa5b1fbc8b35e812bd6c23aa6d824c4b1 (patch) | |
| tree | 34c34a5a3bec60ee415611c716b31ddb0cb5c7af /app/views/layouts/application.html.haml | |
| parent | fa7b7425e7c53282472c1c9ce1cdc7272f55cfd4 (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.haml | 14 |
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' |