From cf0485c4480ef6091b285ea36c1936bb783fbbca Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 19 Nov 2019 14:25:14 +1300 Subject: [PATCH] fix mobile display --- app/views/harvests/_card.html.haml | 5 ----- app/views/harvests/index.html.haml | 4 ++-- app/views/plantings/_card.html.haml | 2 ++ app/views/plantings/index.html.haml | 4 ++-- app/views/seeds/index.html.haml | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/views/harvests/_card.html.haml b/app/views/harvests/_card.html.haml index 53ddcc3d0..0d51fbb40 100644 --- a/app/views/harvests/_card.html.haml +++ b/app/views/harvests/_card.html.haml @@ -7,10 +7,5 @@ %strong = link_to harvest.crop, harvest %span.badge.badge-pill= harvest.plant_part - - if harvest.planting.present? - %p.card-text - %small.text-muted - Harvested from - = link_to harvest.planting, harvest.planting .card-footer .float-right=render 'members/tiny', member: harvest.owner \ No newline at end of file diff --git a/app/views/harvests/index.html.haml b/app/views/harvests/index.html.haml index 0e430615c..f2a5cb044 100644 --- a/app/views/harvests/index.html.haml +++ b/app/views/harvests/index.html.haml @@ -14,7 +14,7 @@ #{ENV['GROWSTUFF_SITE_NAME']} helps you track what you're harvesting from your home garden and see how productive it is. .row - .col-2 + .col-md-2 = render 'layouts/nav', model: Harvest - if @owner = render @owner @@ -27,7 +27,7 @@ = icon 'fas', format.to_s = format.upcase .badge.badge-success= link_to 'API Methods', '/api-docs' - .col-10 + .col-md-10 %section %h2 = page_entries_info @harvests diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml index 2f9ffc6d9..ffd231b5e 100644 --- a/app/views/plantings/_card.html.haml +++ b/app/views/plantings/_card.html.haml @@ -22,3 +22,5 @@ %h4= planting.crop .text-center= render 'plantings/badges', planting: planting = render 'plantings/progress', planting: planting + .card-footer + .float-right=render 'members/tiny', member: planting.owner \ No newline at end of file diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml index e6354dae3..c1f21c44b 100644 --- a/app/views/plantings/index.html.haml +++ b/app/views/plantings/index.html.haml @@ -12,7 +12,7 @@ = title('plantings', @owner, @crop, @planting) .row - .col-2 + .col-md-2 = render 'layouts/nav', model: Planting %hr/ = link_to show_inactive_tickbox_path('plantings', owner: @owner, crop: @crop, show_all: @show_all) do @@ -34,7 +34,7 @@ = format.upcase .badge.badge-success= link_to 'API Methods', '/api-docs' - .col-10 + .col-md-10 %section %h2= page_entries_info @plantings diff --git a/app/views/seeds/index.html.haml b/app/views/seeds/index.html.haml index 446e12edc..e0d17efed 100644 --- a/app/views/seeds/index.html.haml +++ b/app/views/seeds/index.html.haml @@ -11,7 +11,7 @@ = title('seeds', @owner, @crop, @planting) .row - .col-2 + .col-md-2 = render 'layouts/nav', model: Seed %hr/ = link_to show_inactive_tickbox_path('seeds', owner: @owner, crop: @crop, show_all: @show_all) do @@ -32,7 +32,7 @@ = icon 'fas', format.to_s = format.upcase .badge.badge-success= link_to 'API Methods', '/api-docs' - .col-10 + .col-md-10 %section %h2= page_entries_info @seeds = will_paginate @seeds