From 5cedea9da8ebc6bf86ffea52382ba184fbcd21ea Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Fri, 14 Jun 2019 16:23:31 +1200
Subject: [PATCH] removing trailing whitespace

---
 app/assets/stylesheets/overrides.scss  |  2 +-
 app/controllers/members_controller.rb  | 10 +++++-----
 app/views/devise/unlocks/new.html.haml |  3 ---
 app/views/gardens/_form.html.haml      |  2 +-
 app/views/members/_thumbnail.html.haml | 17 +----------------
 app/views/photos/new.html.haml         |  2 +-
 app/views/shared/buttons/_edit.haml    |  2 +-
 7 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss
index 3522f2071..7adbb7362 100755
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -14,7 +14,7 @@ section {
 }
 
 .ellipsis {
-    overflow:hidden; 
+    overflow:hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 06ef950a9..ab00ac45d 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -11,7 +11,7 @@ class MembersController < ApplicationController
       format.json { render json: @members.to_json(only: member_json_fields) }
     end
   end
-  
+
   # Queries for the show view/action
   def plantings_for_show
     Planting.select(
@@ -23,8 +23,8 @@ class MembersController < ApplicationController
       :slug
      )
   end
-  
-  def harvests_for_show 
+
+  def harvests_for_show
     Harvest.select(
       :id,
       "'harvest' as event_type",
@@ -45,7 +45,7 @@ class MembersController < ApplicationController
       :slug
     )
   end
-  
+
   def comments_for_show
      Comment.select(
        :id,
@@ -56,7 +56,7 @@ class MembersController < ApplicationController
        'null as slug'
      )
   end
-  
+
   def photos_for_show
     Photo.select(
       :id,
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
index 3160bcfac..b8efdf0ac 100644
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
@@ -9,10 +9,7 @@
 
       %h2 Resend unlock instructions
       = devise_error_messages!
-
       = f.email_field :email, class: 'form-control', placeholder: 'email'
-
       = f.submit "Resend unlock instructions", class: 'btn btn-block my-4 btn-primary'
 
-      
     = render "devise/shared/links"
diff --git a/app/views/gardens/_form.html.haml b/app/views/gardens/_form.html.haml
index 9a7a29564..8d61ee8c1 100644
--- a/app/views/gardens/_form.html.haml
+++ b/app/views/gardens/_form.html.haml
@@ -34,7 +34,7 @@
         .col-12
           = f.check_box :active, label: 'Active?'
           %p
-            You can mark a garden as inactive if you no longer use it. 
+            You can mark a garden as inactive if you no longer use it.
             Note: this will mark all plantings in the garden as "finished".
     .card-footer
       .text-right= f.submit 'Save Garden'
diff --git a/app/views/members/_thumbnail.html.haml b/app/views/members/_thumbnail.html.haml
index c64f36843..dc9d7b9ca 100644
--- a/app/views/members/_thumbnail.html.haml
+++ b/app/views/members/_thumbnail.html.haml
@@ -1,18 +1,3 @@
--# .member-thumbnail.well
--#   %div
--#     = render "members/avatar", member: member
--#   %div
--#     %p.login-name
--#       = link_to member.login_name, member
--#       - unless member.location.blank?
--#         %small
--#           %br/
--#           %i= member.location
--#       - unless member.plantings.empty?
--#         %small
--#           %br/
--#           Recently planted:
--#           != member.plantings.order(created_at: :desc).first(3).map { |p| link_to p.crop_name, p }.join(", ")
 - cache member do
   .card.text-center
     / Background color
@@ -20,7 +5,7 @@
     / Avatar
     .avatar.mx-auto.white
       = link_to member do
-        = image_tag(avatar_uri(member, 150), class: 'rounded-circle img-fluid', alt: member)  
+        = image_tag(avatar_uri(member, 150), class: 'rounded-circle img-fluid', alt: member)
     .card-body
       / Name
       %h4.card-title
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index 546eb43af..ea35ecddd 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -21,7 +21,7 @@
 
   - if @sets && @current_set
     %h2= @sets.key(@current_set)
-  
+
   .row.pagination
     .col-md-12= page_entries_info @photos
     .col-md-12= will_paginate @photos
diff --git a/app/views/shared/buttons/_edit.haml b/app/views/shared/buttons/_edit.haml
index f80cdf917..a546b82d0 100644
--- a/app/views/shared/buttons/_edit.haml
+++ b/app/views/shared/buttons/_edit.haml
@@ -1,3 +1,3 @@
 = link_to path, class: 'btn btn-default' do
-  = render 'shared/glyphicon', icon: 'pencil', title: 'buttons.edit'  
+  = render 'shared/glyphicon', icon: 'pencil', title: 'buttons.edit'
   =t('buttons.edit')