Merge pull request #2426 from Growstuff/dev

Production release

.travis.yml

@@ -9,11 +9,7 @@ cache:
   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="

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)

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;
   }
 }

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: '... ')
+      - 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