From 20a76626b93bf126452c1d89780d31eea9dae6d2 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 15:22:29 +1000 Subject: [PATCH 1/6] Add styling for instance where producer is own shopwfront on producer page --- app/assets/stylesheets/darkswarm/producer_node.css.sass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index 08c9fd87ef..81124f9ab4 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -32,6 +32,12 @@ span text-decoration: underline + &.has_shopfront, &.has_shopfront i.ofn-i_059-producer, &.has_shopfront i.ofn-i_060-producer-reversed + color: $clr-brick + &:hover, &:active, &:focus + color: $clr-brick-bright + + a.cta-hub &:hover, &:focus, &:active &.secondary From 7f4bccc956819ceb1a829067e74ab4b3a4c7f8a0 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 15:22:53 +1000 Subject: [PATCH 2/6] fix anchor angular for link to hub shopfront --- app/views/producers/_skinny.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml index 0635bda234..665c4dcf7b 100644 --- a/app/views/producers/_skinny.html.haml +++ b/app/views/producers/_skinny.html.haml @@ -2,7 +2,7 @@ .columns.small-12.medium-4.large-4.skinny-head / This needs logic to show profile only icon when available %i.ofn-i_060-producer-reversed %span{"bo-if" => "producer.has_shopfront" } - %a{"bo-href" => "producer.path" } + %a.has_shopfront{"bo-href" => "producer.path" } %i{ng: {class: "producer.producer_icon_font"}} %span.margin-top %strong {{ producer.name }} From 0b59ca2dc166cdb397362831cbdbfad1615dcdd1 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 15:33:44 +1000 Subject: [PATCH 3/6] Turning Show Profiles checkbox back on ready for logic --- .../shared/components/_filter_controls.html.haml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/views/shared/components/_filter_controls.html.haml b/app/views/shared/components/_filter_controls.html.haml index 4548085550..69a14b84a3 100644 --- a/app/views/shared/components/_filter_controls.html.haml +++ b/app/views/shared/components/_filter_controls.html.haml @@ -10,10 +10,7 @@ No filters .small-12.medium-6.columns.text-right .profile-checkbox - - / Hide until we're ready to work on this: - - / %input{type: "checkbox", name: "profile"}>< - / %label Show profiles - / %button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but they may have their own physical or online shop elsewhere", "popover-placement" => "left"}>< - / %i.ofn-i_013-help + %input{type: "checkbox", name: "profile"}>< + %label Show profiles + %button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but they may have their own physical or online shop elsewhere", "popover-placement" => "left"}>< + %i.ofn-i_013-help From 24ca1b064a93351855d078287f9863e40afec775 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 15:34:56 +1000 Subject: [PATCH 4/6] Tweak language for help popover --- app/views/shared/components/_filter_controls.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/components/_filter_controls.html.haml b/app/views/shared/components/_filter_controls.html.haml index 69a14b84a3..7c8917d2b8 100644 --- a/app/views/shared/components/_filter_controls.html.haml +++ b/app/views/shared/components/_filter_controls.html.haml @@ -12,5 +12,5 @@ .profile-checkbox %input{type: "checkbox", name: "profile"}>< %label Show profiles - %button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but they may have their own physical or online shop elsewhere", "popover-placement" => "left"}>< + %button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but do have their own physical or online shop elsewhere", "popover-placement" => "left"}>< %i.ofn-i_013-help From e1769e638d3adf9dbbca6e07eda6635cecfd2b03 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 16:14:53 +1000 Subject: [PATCH 5/6] More styling for producer page --- app/assets/stylesheets/darkswarm/producer_node.css.sass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index 81124f9ab4..22541055f4 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -37,7 +37,6 @@ &:hover, &:active, &:focus color: $clr-brick-bright - a.cta-hub &:hover, &:focus, &:active &.secondary @@ -57,9 +56,11 @@ .fat-taxons background-color: $clr-turquoise-light + .producer-name + color: $clr-turquoise + //Open row &.open - .active_table_row border-left: 1px solid $clr-turquoise-bright border-right: 1px solid $clr-turquoise-bright From 9a4ba5aa1f2b621485c804a5410603dbb0c552cf Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 18 Sep 2014 16:15:14 +1000 Subject: [PATCH 6/6] Producer page styling and logic for markup --- app/views/producers/_skinny.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml index 665c4dcf7b..37767b3789 100644 --- a/app/views/producers/_skinny.html.haml +++ b/app/views/producers/_skinny.html.haml @@ -1,12 +1,11 @@ .row.active_table_row{"ng-click" => "toggle()", "ng-class" => "{'closed' : !open(), 'has_shopfront' : producer.has_shopfront}"} .columns.small-12.medium-4.large-4.skinny-head - / This needs logic to show profile only icon when available %i.ofn-i_060-producer-reversed %span{"bo-if" => "producer.has_shopfront" } %a.has_shopfront{"bo-href" => "producer.path" } %i{ng: {class: "producer.producer_icon_font"}} %span.margin-top %strong {{ producer.name }} - %span{"bo-if" => "!producer.has_shopfront" } + %span.producer-name{"bo-if" => "!producer.has_shopfront" } %i{ng: {class: "producer.producer_icon_font"}} %span.margin-top %strong {{ producer.name }}