diff options
| author | elijah <elijah@riseup.net> | 2013-06-17 01:26:35 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-06-17 01:26:35 -0700 |
| commit | 8b7621793fe5f8fa55c955045a71821c53d4759f (patch) | |
| tree | 872071d4fd3510d319288b32aeb8cdcdcf741a22 /app/views/layouts/application.html.haml | |
| parent | 15d48c24e529e2f944b026749c5eb35eb4c5cfa7 (diff) | |
start of new ui - css changes, layout changes, navigation changes.
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rw-r--r-- | app/views/layouts/application.html.haml | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e6d22f0..719d699 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,15 +9,27 @@ = csrf_meta_tags = yield(:head) %body - %header.navbar.navbar-fixed-top - %nav.navbar-inner - .container - = render 'layouts/navigation' - #main{:role => "main"} - .container - .content - .row + #masthead + - if logged_in? + = render 'layouts/masthead' + - else + = render 'layouts/masthead_large' + #main + .container-fluid + - if logged_in? + .row-fluid .span12 + = render 'layouts/header' + .row-fluid + .span2 + = render 'layouts/navigation' + .span10 = render 'layouts/messages' = yield - %footer + - else + .row-fluid + .span12 + = render 'layouts/messages' + = yield + #footer + = render 'layouts/footer' |