Merge branch 'pr/782' into dev

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 {

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

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

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(", ")

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"