From fe0956d3bb00241e62b5cbc85eb03d730c7ba970 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 18 Jul 2014 16:36:14 +1000 Subject: [PATCH] Update markup to make total price its own row on small devices --- app/views/shop/products/_form.html.haml | 6 +++--- app/views/shop/products/_master.html.haml | 12 ++++++------ app/views/shop/products/_variants.html.haml | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index b4ba453d51..3885f948bd 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -4,7 +4,7 @@ = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do .row - .small-12.medium-8.large-8.columns + .small-12.columns %input#search.text{"ng-model" => "query", placeholder: "Search by product or producer", "ng-debounce" => "100", @@ -12,8 +12,8 @@ = render partial: "shop/products/filters" - .small-12.medium-4.large-4.columns - %input.button.primary.right{type: :submit, value: "Checkout now"} + / .small-12.medium-4.large-4.columns + / %input.button.primary.right{type: :submit, value: "Checkout now"} %div.pad-top{bindonce: true} %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", diff --git a/app/views/shop/products/_master.html.haml b/app/views/shop/products/_master.html.haml index 3e777784de..da760f749e 100644 --- a/app/views/shop/products/_master.html.haml +++ b/app/views/shop/products/_master.html.haml @@ -7,7 +7,7 @@ \ Bulk -# WITHOUT GROUP BUY -.small-4.medium-3.large-3.columns.text-right{"bo-if" => "!product.group_buy"} +.small-5.medium-3.large-3.columns.text-right{"bo-if" => "!product.group_buy"} %input{type: :number, min: 0, placeholder: "0", @@ -18,7 +18,7 @@ "ng-model" => "product.quantity"} -# WITH GROUP BUY -.small-4.medium-3.large-3.columns.text-right{"bo-if" => "product.group_buy"} +.small-5.medium-3.large-3.columns.text-right{"bo-if" => "product.group_buy"} %span.bulk-input-container %span.bulk-input %input.bulk.first{type: :number, @@ -38,11 +38,11 @@ name: "variant_attributes[{{product.master.id}}][max_quantity]", "ng-model" => "product.max_quantity"} -.small-2.medium-1.large-1.columns.variant-unit +.small-3.medium-1.large-1.columns.variant-unit .table-cell %em {{ product.master.unit_to_display }} -.small-3.medium-2.large-2.columns.variant-price +.small-4.medium-2.large-2.columns.variant-price .table-cell %i.ofn-i_009-close {{ product.price | currency }} @@ -50,7 +50,7 @@ %i.ofn-i_028-barcode -.small-3.medium-2.large-2.columns.total-price.text-right +.small-12.medium-2.large-2.columns.total-price.text-right .table-cell - %strong $10,000.95 + %strong $100.95 diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml index 70889d0cce..b3bb8e62f3 100644 --- a/app/views/shop/products/_variants.html.haml +++ b/app/views/shop/products/_variants.html.haml @@ -10,7 +10,7 @@ \ Bulk -# WITHOUT GROUP BUY - .small-4.medium-3.large-3.columns.text-right{"bo-if" => "!product.group_buy"} + .small-5.medium-3.large-3.columns.text-right{"bo-if" => "!product.group_buy"} %input{type: :number, value: nil, min: 0, @@ -22,7 +22,7 @@ -# WITH GROUP BUY - .small-4.medium-3.large-3.columns.text-right{"bo-if" => "product.group_buy"} + .small-5.medium-3.large-3.columns.text-right{"bo-if" => "product.group_buy"} %span.bulk-input-container %span.bulk-input %input.bulk.first{type: :number, @@ -42,17 +42,17 @@ name: "variant_attributes[{{variant.id}}][max_quantity]", "ng-model" => "variant.max_quantity"} - .small-2.medium-1.large-1.columns.variant-unit + .small-3.medium-1.large-1.columns.variant-unit .table-cell %em {{ variant.unit_to_display }} - .small-3.medium-2.large-2.columns.variant-price + .small-4.medium-2.large-2.columns.variant-price .table-cell %i.ofn-i_009-close {{ variant.price | currency }} %a{}>< %i.ofn-i_028-barcode - .small-3.medium-2.large-2.columns.total-price.text-right + .small-12.medium-2.large-2.columns.total-price.text-right .table-cell - %strong $10,000.95 + %strong $100.95