diff options
| author | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
| commit | 7e0573f3347dca6323eae05127849431ecbceb77 (patch) | |
| tree | 8a6ff58fdcc93493b5a8f332350b0a9292119906 /app/views/layouts/application.html.haml | |
| parent | 3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff) | |
| parent | d578c07e196cd9758fbf1752a9bb8477c260bb30 (diff) | |
Merge branch 'develop' into feature/messages_api
Conflicts:
users/config/locales/en.yml
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rw-r--r-- | app/views/layouts/application.html.haml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 816b558..1cd4ec3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -10,15 +10,17 @@ = csrf_meta_tags = yield(:head) %body - #masthead + #wrap = render 'layouts/masthead' - #main - .container-fluid - - if logged_in? + #main + .container-fluid + - if logged_in? + .row-fluid + .span12 + = render 'layouts/header' .row-fluid - .span12 - = render 'layouts/header' - .row-fluid - = render 'layouts/content' + = render 'layouts/content' + #push + -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer = render 'layouts/footer' |