From fcf4e0f15dabb27a5870747b8cf912cf71209b5c Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 17 Jun 2019 10:42:12 +1200 Subject: [PATCH] Icons from icon8, used with permission --- .gitignore | 2 -- app/assets/images/icons/delete.svg | 11 ++++++++++ app/assets/images/icons/finished.svg | 23 +++++++++++++++++++++ app/assets/images/icons/garden.svg | 26 ++++++++++++++++++++++++ app/assets/images/icons/harvest.svg | 5 +++++ app/assets/images/icons/home.svg | 5 +++++ app/assets/images/icons/plant-seeds.svg | 3 +++ app/assets/images/icons/planting.svg | 5 +++++ app/assets/images/icons/post.svg | 6 ++++++ app/assets/images/icons/seeds-colour.svg | 18 ++++++++++++++++ app/assets/images/icons/seeds.svg | 5 +++++ app/assets/images/icons/trade.svg | 5 +++++ app/assets/stylesheets/overrides.scss | 4 ++++ app/helpers/icons_helper.rb | 15 +++++++++----- 14 files changed, 126 insertions(+), 7 deletions(-) create mode 100644 app/assets/images/icons/delete.svg create mode 100644 app/assets/images/icons/finished.svg create mode 100644 app/assets/images/icons/garden.svg create mode 100644 app/assets/images/icons/harvest.svg create mode 100644 app/assets/images/icons/home.svg create mode 100644 app/assets/images/icons/plant-seeds.svg create mode 100644 app/assets/images/icons/planting.svg create mode 100644 app/assets/images/icons/post.svg create mode 100644 app/assets/images/icons/seeds-colour.svg create mode 100644 app/assets/images/icons/seeds.svg create mode 100644 app/assets/images/icons/trade.svg diff --git a/.gitignore b/.gitignore index 0cb26bd3b..96147c719 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,3 @@ cc-test-reporter elasticsearch-*.deb elasticsearch-*.deb.sha512 -app/assets/images/*.svg -app/assets/images/icons/*.svg diff --git a/app/assets/images/icons/delete.svg b/app/assets/images/icons/delete.svg new file mode 100644 index 000000000..899b79b86 --- /dev/null +++ b/app/assets/images/icons/delete.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/assets/images/icons/finished.svg b/app/assets/images/icons/finished.svg new file mode 100644 index 000000000..e1e151dda --- /dev/null +++ b/app/assets/images/icons/finished.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/icons/garden.svg b/app/assets/images/icons/garden.svg new file mode 100644 index 000000000..11b9396f7 --- /dev/null +++ b/app/assets/images/icons/garden.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/harvest.svg b/app/assets/images/icons/harvest.svg new file mode 100644 index 000000000..e941e9e92 --- /dev/null +++ b/app/assets/images/icons/harvest.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/home.svg b/app/assets/images/icons/home.svg new file mode 100644 index 000000000..ae5dc8d22 --- /dev/null +++ b/app/assets/images/icons/home.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/plant-seeds.svg b/app/assets/images/icons/plant-seeds.svg new file mode 100644 index 000000000..86fc2a6c7 --- /dev/null +++ b/app/assets/images/icons/plant-seeds.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/planting.svg b/app/assets/images/icons/planting.svg new file mode 100644 index 000000000..48d867aa0 --- /dev/null +++ b/app/assets/images/icons/planting.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/post.svg b/app/assets/images/icons/post.svg new file mode 100644 index 000000000..2e8615513 --- /dev/null +++ b/app/assets/images/icons/post.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/assets/images/icons/seeds-colour.svg b/app/assets/images/icons/seeds-colour.svg new file mode 100644 index 000000000..b2bc3e95b --- /dev/null +++ b/app/assets/images/icons/seeds-colour.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/seeds.svg b/app/assets/images/icons/seeds.svg new file mode 100644 index 000000000..e546336af --- /dev/null +++ b/app/assets/images/icons/seeds.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/trade.svg b/app/assets/images/icons/trade.svg new file mode 100644 index 000000000..d2395b956 --- /dev/null +++ b/app/assets/images/icons/trade.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss index a3496358c..d6c9d6c65 100755 --- a/app/assets/stylesheets/overrides.scss +++ b/app/assets/stylesheets/overrides.scss @@ -95,6 +95,10 @@ h3 { } } +img.img-icon { + width: 1.2em; +} + .img-square { object-fit: cover; height: 150px; diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 88e47a300..68a84e9b0 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -2,11 +2,11 @@ module IconsHelper include FontAwesome::Sass::Rails::ViewHelpers def garden_icon - icon('fas', 'square') + image_icon 'home' end def planting_icon - icon('fas', 'seedling') + image_icon 'planting' end def member_icon @@ -14,11 +14,11 @@ module IconsHelper end def harvest_icon - icon('fas', 'carrot') + image_icon 'harvest' end def seed_icon - icon('fas', 'heart') + image_icon 'seeds' end def comment_icon @@ -46,7 +46,7 @@ module IconsHelper end def blog_icon - icon('fas', 'comments') + image_icon 'post' end def perennial_icon @@ -72,4 +72,9 @@ module IconsHelper image_tag("sunniness_not_specified.png", class: 'img', alt: 'unknown', width: 55) end end + + def image_icon(icon) + image_tag "icons/#{icon}.svg", class: 'img img-icon' + end + end