diff --git a/app/assets/stylesheets/darkswarm/checkout.css.sass b/app/assets/stylesheets/darkswarm/checkout.css.sass index d90c81f673..e9a7f09597 100644 --- a/app/assets/stylesheets/darkswarm/checkout.css.sass +++ b/app/assets/stylesheets/darkswarm/checkout.css.sass @@ -46,6 +46,11 @@ checkout // Logic to swap out up / down accordion icons + //Foundation overrides + dd > a:hover + background: $clr-brick-ultra-light !important + color: $clr-brick + dd span.accordion-up display: none diff --git a/app/views/checkout/_billing.html.haml b/app/views/checkout/_billing.html.haml index 27fc2b202f..5ec2f12208 100644 --- a/app/views/checkout/_billing.html.haml +++ b/app/views/checkout/_billing.html.haml @@ -13,15 +13,19 @@ "ng-class" => "{valid: billing.$valid, open: accordion.billing}"} %accordion-heading .row - .small-11.columns + .small-10.columns %em %small {{ summary() | printArray }} - .small-1.columns.right - %span.accordion-up.right - %i.ofn-i_006-caret-up - %span.accordion-down.right - %i.ofn-i_005-caret-down + .small-2.columns.text-right + %span.accordion-up + %em + %small Hide + %i.ofn-i_053-point-up + %span.accordion-down + %em + %small Expand + %i.ofn-i_052-point-down = f.fields_for :bill_address, @order.bill_address do |ba| .row diff --git a/app/views/checkout/_details.html.haml b/app/views/checkout/_details.html.haml index 5be6b84043..e3b369182f 100644 --- a/app/views/checkout/_details.html.haml +++ b/app/views/checkout/_details.html.haml @@ -13,15 +13,19 @@ "ng-class" => "{valid: details.$valid, open: accordion.details}"} %accordion-heading .row - .small-11.columns + .small-10.columns %em %small {{ summary() | printArray }} - .small-1.columns.right - %span.accordion-up.right - %i.ofn-i_006-caret-up - %span.accordion-down.right - %i.ofn-i_005-caret-down + .small-2.columns.text-right + %span.accordion-up + %em + %small Hide + %i.ofn-i_053-point-up + %span.accordion-down + %em + %small Expand + %i.ofn-i_052-point-down .row .small-6.columns diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml index bf1c20cac5..e8b559b630 100644 --- a/app/views/checkout/_payment.html.haml +++ b/app/views/checkout/_payment.html.haml @@ -13,15 +13,19 @@ "ng-class" => "{valid: payment.$valid, open: accordion.payment}"} %accordion-heading .row - .small-11.columns + .small-10.columns %em %small {{ Order.paymentMethod().name }} - .small-1.columns.right - %span.accordion-up.right - %i.ofn-i_006-caret-up - %span.accordion-down.right - %i.ofn-i_005-caret-down + .small-2.columns.text-right + %span.accordion-up + %em + %small Hide + %i.ofn-i_053-point-up + %span.accordion-down + %em + %small Expand + %i.ofn-i_052-point-down - current_order.available_payment_methods.each do |method| .row diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml index 074938caae..1fc7bb5a4a 100644 --- a/app/views/checkout/_shipping.html.haml +++ b/app/views/checkout/_shipping.html.haml @@ -13,15 +13,19 @@ "ng-class" => "{valid: shipping.$valid, open: accordion.shipping}"} %accordion-heading .row - .small-11.columns + .small-10.columns %em %small {{ Order.shippingMethod().name }} - .small-1.columns.right - %span.accordion-up.right - %i.ofn-i_006-caret-up - %span.accordion-down.right - %i.ofn-i_005-caret-down + .small-2.columns.text-right + %span.accordion-up + %em + %small Hide + %i.ofn-i_053-point-up + %span.accordion-down + %em + %small Expand + %i.ofn-i_052-point-down .small-12.columns.medium-6.columns.large-6.columns - for ship_method, i in current_distributor.shipping_methods.uniq