From 92cce5910e203bf0cd1813525d581c441fed2cca Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 23 May 2016 16:35:58 +0930 Subject: [PATCH] Improve planting card UI on mobile --- app/assets/stylesheets/overrides.sass | 21 +++++++++++---------- app/views/plantings/_thumbnail.html.haml | 11 ++++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index b9af04816..4ab1e7738 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -102,17 +102,18 @@ p.stats dd margin-left: auto -.planting-thumbnail - dl.planting-attributes - font-size: 85% - width: 100% +@media (min-width: $screen-md-min) + .planting-thumbnail + dl.planting-attributes + font-size: 85% + width: 100% - dt - text-align: left - width: 80px - dd - padding-left: 80px - margin-left: auto + dt + text-align: left + width: 80px + dd + padding-left: 80px + margin-left: auto #placesmap, #cropmap height: 500px diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml index 94b51862f..3ae1ee084 100644 --- a/app/views/plantings/_thumbnail.html.haml +++ b/app/views/plantings/_thumbnail.html.haml @@ -3,9 +3,9 @@ %h3.panel-title= link_to planting.crop.name, planting.crop .panel-body .row - .col-xs-4.col-md-4 + .col-xs-12.col-md-4 = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => planting.crop_id, :class => 'img'), planting - .col-xs-4.col-md-5 + .col-xs-7.col-md-5 %dl.dl-horizontal.planting-attributes %dt Owner: %dd= link_to planting.owner.login_name, planting.owner @@ -24,7 +24,7 @@ = " (#{sunniness})" %dt Planted from: %dd= "#{display_planted_from(planting)}" - .col-xs-4.col-md-3 + .col-xs-1.col-md-3 %ul{:style => "list-style-type:none; text-align:right"} %li= link_to 'Details', planting, :class => 'btn btn-default btn-xs' - if can? :edit, planting @@ -33,11 +33,12 @@ %li= link_to "Mark as finished", planting_path(planting, :planting => {:finished => 1}), :method => :put, :class => 'btn btn-default btn-xs append-date' - if can? :destroy, planting %li= link_to 'Delete', planting, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-default btn-xs' + .row - .col-xs-3.col-md-4 + .col-xs-12.col-md-4 %dl %dt Days until maturity: %dd= "#{display_days_before_maturity(planting)}" - .col-xs-9.col-md-8 + .col-xs-12.col-md-8 = render partial: 'plantings/planting_progress', locals: {planting: planting}