From 8c02ea943a569dddc7e2c83bb7fc2e0d8021e4cf Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 3 Jul 2019 08:25:23 +1200 Subject: [PATCH] Tidy up photo display (line up) --- app/assets/stylesheets/overrides.scss | 2 +- app/views/crops/_photos.html.haml | 6 ++---- app/views/photos/_gallery.haml | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss index c858e6b09..514ecf53b 100755 --- a/app/assets/stylesheets/overrides.scss +++ b/app/assets/stylesheets/overrides.scss @@ -85,7 +85,7 @@ h3 { flex-wrap: wrap; .card { - margin: 1em; + margin: 1em 1em 1em 0; width: 200px; } } diff --git a/app/views/crops/_photos.html.haml b/app/views/crops/_photos.html.haml index 1151e330d..170867ed8 100644 --- a/app/views/crops/_photos.html.haml +++ b/app/views/crops/_photos.html.haml @@ -2,10 +2,8 @@ %h2 #{photo_icon} Photos - [Planting, Harvest, Seed].each do |model_name| - if photos.by_model(model_name).size.positive? - .crop-photos - %h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")} - .index-cards - = render 'photos/gallery', photos: photos.by_model(model_name).limit(8) + %h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")} + = render 'photos/gallery', photos: photos.by_model(model_name).limit(8) = link_to 'more photos ยป', crop_photos_path(@crop), class: 'btn' %hr/ diff --git a/app/views/photos/_gallery.haml b/app/views/photos/_gallery.haml index b61ebe7b1..98bed3450 100644 --- a/app/views/photos/_gallery.haml +++ b/app/views/photos/_gallery.haml @@ -1,3 +1,4 @@ -- photos.each do |photo| - .photo-grid-item= render 'photos/card', photo: photo +.index-cards + - photos.each do |photo| + .photo-grid-item= render 'photos/card', photo: photo