diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2019-05-01 21:11:53 +0200 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2019-05-01 21:11:53 +0200 |
commit | 751b112b7ab1766aa08d3422ecd1924354b9cd59 (patch) | |
tree | 5982c8cc5fe861209d8e7baf9ca6e39b48dc9e89 /app/views | |
parent | a7a2fc57cf458fee98bad03b3c2a40b6e8d75606 (diff) | |
download | hmnoweb-751b112b7ab1766aa08d3422ecd1924354b9cd59.tar.gz hmnoweb-751b112b7ab1766aa08d3422ecd1924354b9cd59.tar.bz2 hmnoweb-751b112b7ab1766aa08d3422ecd1924354b9cd59.zip |
Move towards flexbox layout.
Main page and header now use flexbox instead of not quite working
floats and position relative/absolute. This really simplifies things.
Perhaps we'll even be able to make a mobile friendly site some day.
Various other cosmetic tweaks have snuch in too. The page now has a
max size of about 25cm, and some other minor tweaks.
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/application.html.erb | 6 | ||||
-rw-r--r-- | app/views/refinery/_header.html.erb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 726ccae..a1ecaff 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,8 +26,10 @@ </header> <section id="page"> <%= render 'common/left_sidebar' %> - <%= render :partial => 'refinery/banners/shared/banners' %> - <%= yield %> + <div id="page-content-area"> + <%= render :partial => 'refinery/banners/shared/banners' %> + <%= yield %> + </div> <%= render 'common/right_sidebar' %> </section> <footer> diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb index a1a146c..4dbdfc2 100644 --- a/app/views/refinery/_header.html.erb +++ b/app/views/refinery/_header.html.erb @@ -17,8 +17,10 @@ <div id='logo'> <%= link_to image_tag("logo.png", :alt => "Heavymetal.no"), refinery.root_path %> </div> +<div id="menu-area"> + <%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %> +</div> <div id="merchlink"> <%= link_to image_tag("hypestore-logo.png", alt: "Hypestore", size: '197x75'), 'https://hypestore.no/collections/artistmerch-1' %> <%= link_to "HMNO Merch!", 'https://hypestore.no/collections/artistmerch-1' %> </div> -<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %> |