diff --git a/app/assets/stylesheets/overrides.css.less b/app/assets/stylesheets/overrides.css.less index a5cadf377..72ad21234 100644 --- a/app/assets/stylesheets/overrides.css.less +++ b/app/assets/stylesheets/overrides.css.less @@ -97,12 +97,25 @@ p.stats { font-weight: bold; } -.homepage-members { - height: 100px; +.member-cards { + display: flex; + flex: none; + flex-wrap: wrap; + justify-content: space-between; } +.member-thumbnail { + padding: .25em; -.homepage-members:nth-child(odd) { - margin-left: 0px; + div { + width: 5em; + display: inline-block; + vertical-align: top; + } + + div ~ div { + width: 15em; + padding-left: 1em; + } } #placesmap, #cropmap { diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb index b4fb49d06..57f0c7bc6 100644 --- a/app/helpers/gardens_helper.rb +++ b/app/helpers/gardens_helper.rb @@ -1,8 +1,8 @@ module GardensHelper def display_garden_description(garden) - if garden.description.nil? - "no description provided." + if garden.description.nil? + "no description provided." else truncate(garden.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", garden_path(garden) } end diff --git a/app/views/home/_members.html.haml b/app/views/home/_members.html.haml index cca5829d6..aea526c21 100644 --- a/app/views/home/_members.html.haml +++ b/app/views/home/_members.html.haml @@ -2,12 +2,12 @@ .hidden-xs - members = Member.interesting.first(6) - if members.present? + %section %h2= t('.title') - .row + .member-cards - members.each do |m| - .col-md-4.homepage-members - = render :partial => "members/thumbnail", :locals => { :member => m } + = render :partial => "members/thumbnail", :locals => { :member => m } %p.text-right = link_to "#{t('.view_all')} ยป", members_path diff --git a/app/views/members/_thumbnail.html.haml b/app/views/members/_thumbnail.html.haml index c90faba8a..5f0f9c58d 100644 --- a/app/views/members/_thumbnail.html.haml +++ b/app/views/members/_thumbnail.html.haml @@ -1,17 +1,16 @@ - cache member do - .row - .member-thumbnail - .col-md-3 - = render :partial => "members/image_with_popover", :locals => { :member => member } - .col-md-9 - %p - = link_to member.login_name, member - - if ! member.location.blank? - %small - %br/ - %i= member.location - - if ! member.plantings.empty? - %small - %br/ - Recently planted: - != member.plantings.first(3).map{|p| link_to p.crop_name, p }.join(", ") + .member-thumbnail.panel + %div + = render :partial => "members/image_with_popover", :locals => { :member => member } + %div + %p + = link_to member.login_name, member + - if ! member.location.blank? + %small + %br/ + %i= member.location + - if ! member.plantings.empty? + %small + %br/ + Recently planted: + != member.plantings.first(3).map{|p| link_to p.crop_name, p }.join(", ") diff --git a/app/views/members/index.html.haml b/app/views/members/index.html.haml index 36ba70887..0fa659ede 100644 --- a/app/views/members/index.html.haml +++ b/app/views/members/index.html.haml @@ -10,11 +10,9 @@ = page_entries_info @members, :model => "members" = will_paginate @members -.row +.member-cards - @members.each do |m| - .col-md-4.three-across - .thumbnail - = render :partial => "members/thumbnail", :locals => { :member => m } + = render :partial => "members/thumbnail", :locals => { :member => m } %div.pagination = page_entries_info @members, :model => "members"