From b70546f2783503bf98febfe5ffc146131552b741 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 17 Dec 2017 14:53:32 +0100 Subject: Add styling for GalleryLinks. --- app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/gallery_links.scss | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 app/assets/stylesheets/gallery_links.scss (limited to 'app') diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1f93b7e..fbd78ca 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,4 +15,5 @@ *= require hmno_main *= require hmno_page *= require hmno_sidebars + *= require gallery_links */ diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss new file mode 100644 index 0000000..ebfc852 --- /dev/null +++ b/app/assets/stylesheets/gallery_links.scss @@ -0,0 +1,9 @@ +.gallery_link { + display: inline-block; + width: 235px; + vertical-align: top; + + .gallery_link_meta { + font-size: 80%; + } +} \ No newline at end of file -- cgit v1.2.3 From 1e7370fc998c64c42606b676c7003dd4bd82436b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 30 Dec 2017 15:31:55 +0100 Subject: Make the sidebar processing more robust when there's nothing to show. --- app/helpers/sidebar_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb index e8e076a..97bb560 100644 --- a/app/helpers/sidebar_helper.rb +++ b/app/helpers/sidebar_helper.rb @@ -15,6 +15,6 @@ module SidebarHelper def page_has_side_body?(page) part = page.part_with_title("Side Body") - return part.present? && !part.body.empty? + return part.present? && !part.try(:body).try(:empty?) end end -- cgit v1.2.3 From c1bf3b1e9584d7070f2aa5ab143d02d7f88e80b4 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 30 Dec 2017 15:44:47 +0100 Subject: use relative URLs for page parts in layout. --- app/views/layouts/application.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6a92b7f..547013d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,13 +1,13 @@ <%= render '/refinery/html_tag' %> - <% site_bar = render('/refinery/site_bar', :head => true) -%> - <%= render '/refinery/head' %> + <% site_bar = render('refinery/site_bar', :head => true) -%> + <%= render 'refinery/head' %> <%= site_bar -%> - <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%> + <%= render 'refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>

<%= render 'common/left_sidebar' %> @@ -16,10 +16,10 @@ <%= render 'common/right_sidebar' %>

- <%= render '/refinery/javascripts' %> + <%= render 'refinery/javascripts' %> <%= piwik_tracking_tag %> -- cgit v1.2.3 From a45c1191c7d0cced2e069fe558124bb36c436828 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 6 Jan 2018 19:08:27 +0100 Subject: Just turn off display of page side body. --- app/helpers/sidebar_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb index 97bb560..ad9c6de 100644 --- a/app/helpers/sidebar_helper.rb +++ b/app/helpers/sidebar_helper.rb @@ -14,7 +14,8 @@ module SidebarHelper end def page_has_side_body?(page) - part = page.part_with_title("Side Body") - return part.present? && !part.try(:body).try(:empty?) + #part = page.part_with_title("Side Body") + #return part.present? && !part.try(:body).try(:empty?) + false end end -- cgit v1.2.3 From 737c36d242339b6d678842dad4edcf17a5f4c8b9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 6 Jan 2018 22:10:47 +0100 Subject: Add spacing between rows in the gallery_links index. --- app/assets/stylesheets/gallery_links.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss index ebfc852..e113a4c 100644 --- a/app/assets/stylesheets/gallery_links.scss +++ b/app/assets/stylesheets/gallery_links.scss @@ -1,9 +1,16 @@ .gallery_link { display: inline-block; width: 235px; + margin-bottom: 8mm; vertical-align: top; + header { + h1 { + font-size: 100%; + } + } + .gallery_link_meta { font-size: 80%; } -} \ No newline at end of file +} -- cgit v1.2.3 From 5e00e8d5e1d7b54bc1bebf3d3bbcffc64531733a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 7 Jan 2018 00:06:16 +0100 Subject: Set width of gallery_link to same as image. --- app/assets/stylesheets/gallery_links.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss index e113a4c..5556db6 100644 --- a/app/assets/stylesheets/gallery_links.scss +++ b/app/assets/stylesheets/gallery_links.scss @@ -1,8 +1,11 @@ .gallery_link { display: inline-block; - width: 235px; - margin-bottom: 8mm; + width: 225px; vertical-align: top; + margin: { + bottom: 8mm; + right: 10mm; + } header { h1 { -- cgit v1.2.3 From a43ed4dcf9173a6faadf260fb1bd93aa2d391257 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 7 Jan 2018 00:16:03 +0100 Subject: Drop margin around image in gallery_links. --- app/assets/stylesheets/gallery_links.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app') diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss index 5556db6..305d484 100644 --- a/app/assets/stylesheets/gallery_links.scss +++ b/app/assets/stylesheets/gallery_links.scss @@ -11,6 +11,9 @@ h1 { font-size: 100%; } + img { + margin: 0; + } } .gallery_link_meta { -- cgit v1.2.3 From 41b0d6bc69e3b0f751290b442e2f171a0ae8090d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 7 Jan 2018 17:12:47 +0100 Subject: Split GalleryLink header into date, venue and bands. --- app/assets/stylesheets/gallery_links.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss index 305d484..302fd3e 100644 --- a/app/assets/stylesheets/gallery_links.scss +++ b/app/assets/stylesheets/gallery_links.scss @@ -10,12 +10,14 @@ header { h1 { font-size: 100%; + margin-bottom: 0; } - img { - margin: 0; - } - } + margin-bottom: 2mm; + } + img { + margin: 0; + } .gallery_link_meta { font-size: 80%; } -- cgit v1.2.3