Brenda Wallace
7ea14bccfe
Fix alt on img tag
2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982
Remove console debug statement
2019-11-16 20:38:43 +13:00
Brenda Wallace
24f970f4f4
Added alt tag
2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29
add photo to the map, if we have one
2019-11-16 13:20:38 +13:00
Brenda Wallace
535ddcdcff
Added plantings to places map
2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961
Fix markers on crops#show map
2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9
Rename crops js file so it gets included correctly
...
this crops.js.erb file was being ignored because a crops.coffee exists
2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e
Fix marker on member map too
2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6
Added link to icon documentation
2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-16 10:42:22 +13:00
Brenda Wallace
cfef6f5eb2
Link to jump to garden
2019-11-15 11:47:32 +13:00
ImgBotApp
be884ad1fb
[ImgBot] Optimize images
...
*Total -- 24.17kb -> 22.54kb (6.78%)
/app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%)
/app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%)
/app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%)
/app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%)
/app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%)
/app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com >
2019-11-11 05:00:09 +00:00
Brenda Wallace
b214f7ad8d
linking existing plantings to their parent seeds
2019-11-01 02:23:14 +00:00
Brenda Wallace
f7f3ac695f
better name for css class progress-fade
2019-10-24 19:16:41 +13:00
Brenda Wallace
38713af603
plantings timeline with icons
2019-10-24 16:36:16 +13:00
Brenda Wallace
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
Brenda Wallace
7b5698f977
👩🌾 Import openfarm data ( #2177 )
...
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04
👭 Crop companions ( #2176 )
...
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
Brenda Wallace
b7321ed46f
Add source to photos
2019-09-20 22:26:39 +12:00
Brenda Wallace
2d6c022d43
Merge branch 'dev' into display
2019-09-05 10:13:54 +12:00
Brenda Wallace
f16921d994
Remove extra whitespace
2019-09-01 21:22:59 +12:00
Brenda Wallace
4e9ba4f438
Merge css class
2019-09-01 20:50:57 +12:00
Brenda Wallace
f121f7f3fe
Place map on a high zindex, but below the menu
2019-09-01 20:41:12 +12:00
Brenda Wallace
c53015b922
Scss lint
2019-09-01 20:34:34 +12:00
Brenda Wallace
c122aa41d3
Scss lint
2019-09-01 20:30:19 +12:00
Brenda Wallace
2c75f62caf
Avoid using id selectors
2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41
Rename classes to name codeclimate happy
2019-09-01 19:58:47 +12:00
Brenda Wallace
e4908fe299
Removing unused styles
2019-09-01 19:15:34 +12:00
Brenda Wallace
2a55f61a4c
Section padding
...
fixes #2105
2019-09-01 16:29:54 +12:00
Brenda Wallace
909d9b34ef
lint
2019-08-07 22:34:53 +12:00
Brenda Wallace
2f5f8985e7
lint
2019-08-07 22:34:41 +12:00
Brenda Wallace
01b53a0e69
continuing to replace notifications with conversations
2019-07-23 09:37:57 +12:00
Brenda Wallace
bcbb020fde
newline at end of file
2019-07-21 19:27:53 +12:00
Brenda Wallace
965c9af15a
Sort scss lines
2019-07-21 19:18:13 +12:00
Brenda Wallace
c4806fddf3
re-coloured the memberships to green
2019-07-21 17:21:36 +12:00
Brenda Wallace
1df84beb6d
introduce pretty chips for members
2019-07-21 15:29:39 +12:00
Brenda Wallace
a4e0ed0d8d
Fixed deleted imports
2019-07-21 11:25:37 +12:00
Brenda Wallace
629352ef4f
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/application.scss
db/schema.rb
2019-07-20 13:20:10 +12:00
Brenda Wallace
6816fb9072
Added missing semicolon in scss
2019-07-12 12:02:26 +12:00
Brenda Wallace
1b87026df4
Use camel case in js
2019-07-12 11:59:48 +12:00
Brenda Wallace
80ee3eb8f1
Newline at end of file
2019-07-12 11:59:24 +12:00
Brenda Wallace
9686305857
The like icons are now the buttons
2019-07-12 10:13:24 +12:00
Brenda Wallace
b36e80bbad
Use our own class to indicate liked
2019-07-12 09:37:44 +12:00
Brenda Wallace
af0d84d9f1
Updating likes js code
2019-07-12 09:28:45 +12:00
Brenda Wallace
7d1f9c5a3a
Most post like into a wrapper in the html
2019-07-12 08:47:22 +12:00
Brenda Wallace
80429f935a
Merge branch 'dev' into likeable-photos
2019-07-11 22:42:22 +12:00
Brenda Wallace
b064d8db96
tidy up larger screen display of inbox
2019-07-11 10:18:54 +00:00
Brenda Wallace
b1440041cd
Remove duplicate and empty css definitions
2019-07-11 06:18:16 +00:00
Brenda Wallace
430a29865d
Remove badge override
2019-07-11 06:18:16 +00:00
Brenda Wallace
49c02dfaab
Merge branch 'badges' into inbox
2019-07-11 13:16:28 +12:00
Brenda Wallace