From 223caa046c0547dbb6e7e4110ac25204c94fcf4d Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Sat, 24 May 2014 09:15:22 +1000 Subject: [PATCH] Revert "Producers modal styling and markup" This reverts commit 465728576961706c0137b51952476113ffdd3419. Conflicts: app/assets/stylesheets/darkswarm/images.css.sass app/views/modals/_producer.html.haml --- app/views/modals/_producer.html.haml | 40 +++++++++++++++++++--------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 056f9e488f..037a95398b 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -1,12 +1,28 @@ -%ofn-modal{title: "{{ producer.name }}"} - #producer_modal - .row - .small-12.columns - %img{"ng-src" => "producer.promo_image"} - %h3 {{ producer.name }} - .row - .small-6.columns - %p - {{ producer.description }} - .small-6.columns - Stay in touch with {{ producer.name }} +/ %ofn-modal{title: "{{ producer.name }}"} +/ #producer_modal +/ .row +/ .small-12.columns +/ %img{"ng-src" => "producer.promo_image"} +/ %h3 {{ producer.name }} +/ .row +/ .small-6.columns +/ %p +/ {{ producer.description }} +/ .small-6.columns +/ Stay in touch with {{ producer.name }} +/ %a.close-reveal-modal{"ng-click" => "$close()"} × + + +%ofn-modal{title: "{{producer.name}}"} + .row + .columns.small-12 + %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} + %h3 {{ producer.name }} + .row + .columns.small-12.large-6 + %p {{ producer.description }} + .columns.small-12.large-6 + Stay in touch with {{ producer.name }} + / %pre + / {{ producer | json }} + %a.close-reveal-modal{"ng-click" => "$close()"} ×