mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-18 21:56:55 -04:00
removing trailing whitespace
This commit is contained in:
@@ -14,7 +14,7 @@ section {
|
||||
}
|
||||
|
||||
.ellipsis {
|
||||
overflow:hidden;
|
||||
overflow:hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user