From 9cc0bb831acecd04d7579456707b8b0fe6b4a7c2 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 17 Jun 2016 17:44:46 +1000 Subject: [PATCH] Show properties alongside taxons on producer fat view --- .../stylesheets/darkswarm/producer_node.css.sass | 6 +++++- app/views/producers/_fat.html.haml | 16 +++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index 78209845c5..24eb0467c2 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -53,9 +53,13 @@ &:last-child margin-bottom: 1rem - .fat-taxons, .fat-properties + .fat-taxons background-color: $clr-turquoise-light + .fat-properties + background-color: $clr-turquoise-ultra-light + border: 1px solid $clr-turquoise-light + .producer-name color: $clr-turquoise diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml index 0fc082b361..28ed0c985f 100644 --- a/app/views/producers/_fat.html.haml +++ b/app/views/producers/_fat.html.haml @@ -16,15 +16,13 @@ %label = t :producers_buy %p.trans-sentence - %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"} - %render-svg{path: "{{taxon.icon}}"} - %span{"ng-bind" => "::taxon.name"} - - %div - %label Product properties - %p.trans-sentence - %span.fat-properties{"ng-repeat" => "property in producer.properties"} - %span{"ng-bind" => "property.presentation"} + %div + %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"} + %render-svg{path: "{{taxon.icon}}"} + %span{"ng-bind" => "::taxon.name"} + %div + %span.fat-properties{"ng-repeat" => "property in producer.properties"} + %span{"ng-bind" => "property.presentation"} %div.show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}