diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass index 0d6137fb3a..0c345c13f1 100644 --- a/app/assets/stylesheets/darkswarm/shop.css.sass +++ b/app/assets/stylesheets/darkswarm/shop.css.sass @@ -65,6 +65,10 @@ shop & > .content background: none border: none + img + margin: 0px 0px 0px 40px + p + max-width: 555px & > .title, &.active > .title text-transform: uppercase line-height: 50px diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml index 58d37219d9..a964f34769 100644 --- a/app/views/shop/show.html.haml +++ b/app/views/shop/show.html.haml @@ -14,10 +14,11 @@ %tabs .row .section-container.auto{"data-section" => "", "data-options" => "one_up: false"} - %section + %section#about %p.title.avenir{"data-section-title" => ""} %a{href: "#about"} About Us .content{"data-section-content" => ""} + %img.about.right{src: @distributor.promo_image.url(:large)} %p= @distributor.long_description.andand.html_safe %section diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb index 0bfbb140b8..c1f543e29e 100644 --- a/spec/features/consumer/shopping_spec.rb +++ b/spec/features/consumer/shopping_spec.rb @@ -17,6 +17,12 @@ feature "As a consumer I want to shop with a distributor", js: true do page.should have_text distributor.name end + it "shows distributor images" do + visit shop_path + first("distributor img")['src'].should == distributor.logo.url(:thumb) + first("#about img")['src'].should == distributor.promo_image.url(:large) + end + describe "With products in order cycles" do let(:supplier) { create(:supplier_enterprise) } let(:product) { create(:product, supplier: supplier) }