diff options
| author | jessib <jessib@riseup.net> | 2014-01-23 12:05:58 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-23 12:05:58 -0800 |
| commit | d578c07e196cd9758fbf1752a9bb8477c260bb30 (patch) | |
| tree | 4dcbef4b1b2ea9dcd52cf98f1bb98b371a93c631 /app/views/layouts/application.html.haml | |
| parent | 01941b7d930c581a6684f6b939b3ae2f62bd832e (diff) | |
| parent | ce412a9a0ccce22b5b9d90f70369b91d5fc46e4f (diff) | |
Merge pull request #135 from elijh/feature/pages
add some static pages
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' |