diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2014-02-16 19:34:48 +0100 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2014-02-16 19:34:48 +0100 |
| commit | 0416924f0efee7680551aac4c222e4d22cf6d3bb (patch) | |
| tree | 1c3ca2a21740a6cd8145bbd42c11b082e59cc5ad /app | |
| parent | 136a680e868621f28b7f4e2e5c165c9c668b1f9d (diff) | |
| parent | 92f488d04f12324613f17f3cadde3bc131d3f457 (diff) | |
| download | hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.tar.gz hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.tar.bz2 hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.zip | |
Merge branch 'banner-ads'
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/_color_scheme.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/hmno_banners.scss | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/hmno_page.scss | 13 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 1 | ||||
| -rw-r--r-- | app/views/refinery/banners/shared/_banner_image.html.erb | 1 |
5 files changed, 19 insertions, 9 deletions
diff --git a/app/assets/stylesheets/_color_scheme.scss b/app/assets/stylesheets/_color_scheme.scss index bec9288..2b9cd79 100644 --- a/app/assets/stylesheets/_color_scheme.scss +++ b/app/assets/stylesheets/_color_scheme.scss @@ -31,4 +31,6 @@ $body-bg: black; $spacing: 10px; $sidebar-width: 200px; - +$sidebar-margin: $sidebar-width + 2 * $spacing; +$min-center-width: 500px; +$min-page-width: 2 * $sidebar-margin + $min-center-width + 4 * $spacing; diff --git a/app/assets/stylesheets/hmno_banners.scss b/app/assets/stylesheets/hmno_banners.scss new file mode 100644 index 0000000..d01570e --- /dev/null +++ b/app/assets/stylesheets/hmno_banners.scss @@ -0,0 +1,9 @@ +@import "color_scheme"; + +#slider { + margin: { + left: $sidebar-margin; + right: $sidebar-margin; + } + text-align: center; +} diff --git a/app/assets/stylesheets/hmno_page.scss b/app/assets/stylesheets/hmno_page.scss index 132724b..deda694 100644 --- a/app/assets/stylesheets/hmno_page.scss +++ b/app/assets/stylesheets/hmno_page.scss @@ -2,25 +2,22 @@ #page_container { background: $bg; - - margin: { - left: 5em; - right: 5em; - } + min-width: $min-page-width; #page { position: relative; min-height: 1000px; - padding: $spacing; + padding: $spacing / 2; #body_content { + min-width: $min-center-width; margin: { left: $sidebar-width + 3 * $spacing; right: $sidebar-width + 3 * $spacing; } padding: { - left: 0.5em; - right: 0.5em; + left: $spacing / 2; + right: $spacing / 2; } } 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/banners/shared/_banner_image.html.erb b/app/views/refinery/banners/shared/_banner_image.html.erb new file mode 100644 index 0000000..7d0dc25 --- /dev/null +++ b/app/views/refinery/banners/shared/_banner_image.html.erb @@ -0,0 +1 @@ +<%= link_to(image_fu(banner_image.image, '500x'), banner_image.url) %>
\ No newline at end of file |