From 6e930976cb16bc3d34391490579fe357643237fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2020 07:51:54 +0000 Subject: [PATCH 1/6] Bump rubocop-rspec from 1.37.1 to 1.38.0 Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.37.1 to 1.38.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.37.1...v1.38.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cc8ad62db..091786af2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -463,7 +463,7 @@ GEM rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) - rubocop-rspec (1.37.1) + rubocop-rspec (1.38.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby-units (2.3.1) From c12580ed8d274824aca5991a8c2df421fc045078 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 14 Feb 2020 10:07:26 +1300 Subject: [PATCH 2/6] Shrink seed card and fix links --- app/views/seeds/_card.html.haml | 34 ++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/app/views/seeds/_card.html.haml b/app/views/seeds/_card.html.haml index 6decc6778..a4a457643 100644 --- a/app/views/seeds/_card.html.haml +++ b/app/views/seeds/_card.html.haml @@ -1,17 +1,29 @@ - cache seed do - .card.seed-card{class: seed.finished ? 'card-finished' : ''} + .card.seed-card = link_to seed_path(slug: seed.slug) do = image_tag(seed.thumbnail_url ? seed.thumbnail_url : placeholder_image, alt: seed.crop_name, class: 'img-card') .text - %span.chip.member-chip + %h4.card-title + = link_to seed.crop_name, seed_path(slug: seed.slug) + %h5 + %span.text-muted seeds saved by = seed.owner_login_name .card-body - .card-title - = link_to seed.crop_name, seed_path(slug: seed.slug) - - if seed.tradable - .text-muted - = icon 'fas', 'map' - Will trade #{seed.tradable_to} - .badge.badge-pill.badge-location - = icon 'fas', 'map-marker' - = truncate(seed.owner_location, length: 20, separator: ' ', omission: '... ') \ No newline at end of file + - if seed.owner_location + %h6.small.badge.badge-pill.badge-location + = icon 'fas', 'map-marker' + = truncate(seed.owner_location, length: 40, separator: ' ', omission: '... ') + %p + - if seed.quantity + .badge.badge-info #{seed.quantity} seeds + - if seed.organic != 'unknown' + .badge.badge-success.seedtitle--organic= seed.organic + - if seed.gmo != 'unknown' + .badge.badge-success.seedtitle--gmo= seed.gmo + - if seed.heirloom != 'unknown' + .badge.badge-success.seedtitle--heirloom= seed.heirloom + - if seed.tradable + .card-footer + .d-flex.w-100.justify-content-between + %small Will trade #{seed.tradable_to} + / %a.btn.btn-sm{href: "#"} Request From 9853d931c6d1f208cf078da494867600f80d40a3 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 14 Feb 2020 10:07:26 +1300 Subject: [PATCH 3/6] Shrink seed card and fix links --- app/views/seeds/_card.html.haml | 34 ++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/app/views/seeds/_card.html.haml b/app/views/seeds/_card.html.haml index 6decc6778..a4a457643 100644 --- a/app/views/seeds/_card.html.haml +++ b/app/views/seeds/_card.html.haml @@ -1,17 +1,29 @@ - cache seed do - .card.seed-card{class: seed.finished ? 'card-finished' : ''} + .card.seed-card = link_to seed_path(slug: seed.slug) do = image_tag(seed.thumbnail_url ? seed.thumbnail_url : placeholder_image, alt: seed.crop_name, class: 'img-card') .text - %span.chip.member-chip + %h4.card-title + = link_to seed.crop_name, seed_path(slug: seed.slug) + %h5 + %span.text-muted seeds saved by = seed.owner_login_name .card-body - .card-title - = link_to seed.crop_name, seed_path(slug: seed.slug) - - if seed.tradable - .text-muted - = icon 'fas', 'map' - Will trade #{seed.tradable_to} - .badge.badge-pill.badge-location - = icon 'fas', 'map-marker' - = truncate(seed.owner_location, length: 20, separator: ' ', omission: '... ') \ No newline at end of file + - if seed.owner_location + %h6.small.badge.badge-pill.badge-location + = icon 'fas', 'map-marker' + = truncate(seed.owner_location, length: 40, separator: ' ', omission: '... ') + %p + - if seed.quantity + .badge.badge-info #{seed.quantity} seeds + - if seed.organic != 'unknown' + .badge.badge-success.seedtitle--organic= seed.organic + - if seed.gmo != 'unknown' + .badge.badge-success.seedtitle--gmo= seed.gmo + - if seed.heirloom != 'unknown' + .badge.badge-success.seedtitle--heirloom= seed.heirloom + - if seed.tradable + .card-footer + .d-flex.w-100.justify-content-between + %small Will trade #{seed.tradable_to} + / %a.btn.btn-sm{href: "#"} Request From eb749c02fd6dde4007079d735117cb076e4074ab Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 Feb 2020 08:46:33 +1300 Subject: [PATCH 4/6] Turning off postgresql service on travis-ci see if this fixes the build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc4ec480d..3d47cc711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: ruby dist: bionic services: - - postgresql + # - postgresql - xvfb cache: bundler: true From 7472bceeb3b9880d8d5118bc87a318f2585cf590 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 Feb 2020 09:28:39 +1300 Subject: [PATCH 5/6] install postgresql from addonns --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d47cc711..9e13a8ff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,14 @@ sudo: required language: ruby dist: bionic services: - # - postgresql + - postgresql - xvfb cache: bundler: true directories: - tmp/cache/assets/test/sprockets addons: - apt: - packages: - # Postgresql version used here should match production - - postgresql-9.4 - - postgresql-client-9.4 + postgresql: "9.4" code_climate: repo_token: secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk=" From 88615a55f4b8d21de2d6082dc51e0e9e99683daa Mon Sep 17 00:00:00 2001 From: Brenda Date: Sat, 15 Feb 2020 10:05:14 +1300 Subject: [PATCH 6/6] CSS for seeds cards --- app/assets/stylesheets/_seeds.scss | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_seeds.scss b/app/assets/stylesheets/_seeds.scss index e875832ff..8bf8f1158 100644 --- a/app/assets/stylesheets/_seeds.scss +++ b/app/assets/stylesheets/_seeds.scss @@ -1,10 +1,30 @@ .seed-card { .text { - color: $white; + opacity: 0.8; margin: 0; + padding: 0; position: absolute; text-align: center; top: 1em; width: 100%; + + h4 { + color: $white; + background-color: $green; + padding: 0; + margin: 0; + a { + color: $white; + } + a:hover { + color: $black; + } + } + + h5 { + color: $black; + background-color: $beige; + } + color: $black; } }