summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-01-23 02:05:37 -0800
committerelijah <elijah@riseup.net>2014-01-23 11:37:50 -0800
commit91c535a080f05be23ee1320b0701dae6ff3601af (patch)
treea58470bb932a37fc6a049b77f6064c330000057b /app/views/layouts
parent8f624a9f6a130293d921e0f0076a3ecb08b481b7 (diff)
move #masthead out of main templates to make the masthead partials more flexible.
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_masthead.html.haml11
-rw-r--r--app/views/layouts/application.html.haml3
-rw-r--r--app/views/layouts/home.html.haml2
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml
index 5f40c05..35225a1 100644
--- a/app/views/layouts/_masthead.html.haml
+++ b/app/views/layouts/_masthead.html.haml
@@ -1,5 +1,6 @@
-.title
- %span.sitename
- %a{:href => home_path}= APP_CONFIG[:domain]
- - if @show_navigation
- = t(:user_control_panel) \ No newline at end of file
+#masthead
+ .title
+ %span.sitename
+ %a{:href => home_path}= APP_CONFIG[:domain]
+ - if @show_navigation
+ = t(:user_control_panel) \ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e52ca7f..1cd4ec3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,8 +11,7 @@
= yield(:head)
%body
#wrap
- #masthead
- = render 'layouts/masthead'
+ = render 'layouts/masthead'
#main
.container-fluid
- if logged_in?
diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml
index e6fa15d..8451de5 100644
--- a/app/views/layouts/home.html.haml
+++ b/app/views/layouts/home.html.haml
@@ -8,5 +8,5 @@
= javascript_include_tag "application"
= csrf_meta_tags
= yield(:head)
- %body
+ %body.home
= yield \ No newline at end of file