diff --git a/app/assets/javascripts/templates/bulk_buy_modal.html.haml b/app/assets/javascripts/templates/bulk_buy_modal.html.haml index 0de6977f42..14ccbdb18f 100644 --- a/app/assets/javascripts/templates/bulk_buy_modal.html.haml +++ b/app/assets/javascripts/templates/bulk_buy_modal.html.haml @@ -30,5 +30,4 @@ %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}} {{ "js.shop_variant_no_group_buy.increment" | t }} - %ng-include{src: "'partials/close.html'"} diff --git a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml index 39b633ae24..d3ae5b9b46 100644 --- a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml +++ b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml @@ -10,5 +10,5 @@ .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}} {{ "js.shop_variant_no_group_buy.in_cart" | t:{quantity: variant.line_item.quantity} }} %input{type: :hidden, - name: "variants[{{::variant.id}}]", - ng: {model: "variant.line_item.quantity"}} + name: "variants[{{::variant.id}}]", + ng: {model: "variant.line_item.quantity"}} diff --git a/app/assets/stylesheets/darkswarm/_shop-inputs.scss b/app/assets/stylesheets/darkswarm/_shop-inputs.scss index 8a8b030097..1a809d96a1 100644 --- a/app/assets/stylesheets/darkswarm/_shop-inputs.scss +++ b/app/assets/stylesheets/darkswarm/_shop-inputs.scss @@ -8,7 +8,7 @@ @include placeholder(rgba(0, 0, 0, 0.4), #777); } -// Components to add variants to cart and change quanities +// Components to add variants to cart and change quantities // // They are not nested so that they can be used in modals. button.add-variant, button.variant-quantity { @@ -36,6 +36,7 @@ button.add-variant, button.variant-quantity { border-bottom-right-radius: 0.25em; } } + button.add-variant { min-width: 6rem; padding: 0 1em; @@ -46,6 +47,7 @@ button.add-variant { } } } + button.variant-quantity { width: 3rem; @@ -53,6 +55,7 @@ button.variant-quantity { border-right: .1em solid $orange-400; } } + .variant-quantity-display { display: inline-block; font-size: 0.875em; @@ -71,9 +74,11 @@ button.bulk-buy.variant-quantity { border: .1em solid $grey-200; color: inherit; } + button.bulk-buy-add.variant-quantity { width: 2.5rem } + span.bulk-buy.variant-quantity { border: .1em solid $grey-200; height: 2.5rem; @@ -83,10 +88,12 @@ span.bulk-buy.variant-quantity { text-align: center; vertical-align: top; } + .variant-bulk-buy-price-summary { color: $disabled-med; margin-bottom: 1em; } + .variant-bulk-buy-quantity-label { font-size: 0.875rem; margin-bottom: .5em;