aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2014-02-16 19:19:18 +0100
committerHarald Eilertsen <haraldei@anduin.net>2014-02-16 19:19:18 +0100
commitd54d4ca358206971540241bb617dc6dacb097136 (patch)
tree7e1d1acfb558a4a93694bb7b18278475fd6cb2dc /app
parentea5d5dc4fc6923a3701eb0e0b68fdf936217233c (diff)
downloadhmnoweb-d54d4ca358206971540241bb617dc6dacb097136.tar.gz
hmnoweb-d54d4ca358206971540241bb617dc6dacb097136.tar.bz2
hmnoweb-d54d4ca358206971540241bb617dc6dacb097136.zip
Render banners from layout instead of modifying all views.
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/hmno_banners.scss6
-rw-r--r--app/views/layouts/application.html.erb1
-rw-r--r--app/views/refinery/pages/home.html.erb2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/hmno_banners.scss b/app/assets/stylesheets/hmno_banners.scss
index 205b7c9..d01570e 100644
--- a/app/assets/stylesheets/hmno_banners.scss
+++ b/app/assets/stylesheets/hmno_banners.scss
@@ -1,3 +1,9 @@
+@import "color_scheme";
+
#slider {
+ margin: {
+ left: $sidebar-margin;
+ right: $sidebar-margin;
+ }
text-align: center;
}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 43e0863..6f3b70c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,6 +11,7 @@
</header>
<section id="page">
<%= render 'common/left_sidebar' %>
+ <%= render :partial => 'refinery/banners/shared/banners' %>
<%= yield %>
<%= render 'common/right_sidebar' %>
</section>
diff --git a/app/views/refinery/pages/home.html.erb b/app/views/refinery/pages/home.html.erb
index 6207663..66cd6b7 100644
--- a/app/views/refinery/pages/home.html.erb
+++ b/app/views/refinery/pages/home.html.erb
@@ -1,6 +1,4 @@
<% content_for :body do %>
- <%= render :partial => 'refinery/banners/shared/banners' %>
-
<%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
<% if @posts.any? %>