From 78ac55418ce5ee640fbc72a6ef77aaafb8343663 Mon Sep 17 00:00:00 2001 From: summerscope Date: Mon, 28 Jul 2014 13:49:55 +1000 Subject: [PATCH] Tweak producers for responsive views, --- app/views/producers/_fat.html.haml | 36 ++++++++++++++------------- app/views/producers/_skinny.html.haml | 8 +++--- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml index 86ed3ad7b7..10cd2f00b5 100644 --- a/app/views/producers/_fat.html.haml +++ b/app/views/producers/_fat.html.haml @@ -1,30 +1,32 @@ -.row.active_table_row{"ng-show" => "open()"} - .columns.small-12.large-4 -   +.row.active_table_row{"ng-show" => "open()", "ng-click" => "toggle()", "ng-class" => "{'open' : !ofn-i_032-closed-sign()}"} + .columns.small-12.medium-4.large-4.fat %div{"ng-if" => "producer.supplied_taxons"} - %h5 - %i.ofn-i_029-shopping-basket - Shop for + %label Shop for %p.trans-sentence %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"} %render-svg{path: "{{taxon.icon}}"} {{taxon.name}} - .columns.small-12.large-3 -   - %img{src: "{{ producer.logo }}" } - .columns.small-12.large-5 -   + + .columns.small-12.medium-3.large-3.fat + %div{"bo-if" => "producer.logo"} + %img{src: "{{ producer.logo }}" } + + .columns.small-12.medium-5.large-5.fat %div{"bo-if" => "producer.description"} - %h5 About us + %label About us %p.text-small {{ producer.description }} -.row.active_table_row.link{"ng-show" => "open()", "bo-if" => "producer.hubs"} - .cta-container.columns.small-12 - .row - .columns.small-12 - %h5 Shop for {{ producer.name }} products at: +.row.active_table_row{"ng-show" => "open()", "bo-if" => "producer.hubs"} + .columns.small-12 .row + .columns.small-12.fat + %div{"bo-if" => "producer.name"} + %label + Shop for + %span.turquoise {{ producer.name }} + products at: + .row.cta-container .columns.small-12 %a.button.hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'", "bo-href" => "hub.path", "ofn-empties-cart" => "hub", diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml index 429fd33e4a..bce580e5e4 100644 --- a/app/views/producers/_skinny.html.haml +++ b/app/views/producers/_skinny.html.haml @@ -1,12 +1,12 @@ .row.active_table_row{"ng-click" => "toggle()", "ng-class" => "{'closed' : !open()}"} - .columns.small-4 + .columns.small-12.medium-4.large-4.skinny-header %i.ofn-i_036-producers %strong {{ producer.name }} - .columns.small-3 + .columns.small-6.medium-3.large-3 {{ producer.address.city }} - .columns.small-4 + .columns.small-4.medium-3.large-4 {{ producer.address.state | uppercase }} - .columns.small-1.text-right + .columns.small-2.medium-2.large-1.text-right / This forces line-height to be triggered %span   %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"} \ No newline at end of file