From f5e254a105254a6097741e2fc8ddd1efd656c916 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 10:05:00 +0100 Subject: [PATCH 01/13] Remove quick fix for hiding oc selector --- app/views/checkout/edit.html.haml | 2 +- app/views/shopping_shared/_header.html.haml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 27271ae6d3..312b7b5a79 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -15,7 +15,7 @@ %strong = pickup_time current_order_cycle - = render partial: "shopping_shared/header", locals: { hide_oc_selector: true } + = render partial: "shopping_shared/header" %accordion{"close-others" => "false"} %checkout.row{"ng-controller" => "CheckoutCtrl"} diff --git a/app/views/shopping_shared/_header.html.haml b/app/views/shopping_shared/_header.html.haml index 37806539e2..03661a22ea 100644 --- a/app/views/shopping_shared/_header.html.haml +++ b/app/views/shopping_shared/_header.html.haml @@ -10,6 +10,5 @@ = distributor.name %location= distributor.address.city - - unless defined? hide_oc_selector - .show-for-large-up.large-4.columns - = render partial: "shopping_shared/order_cycles" + .show-for-large-up.large-4.columns + = render partial: "shopping_shared/order_cycles" From 91e88bd02842df82d45eb5f72f978f96ce7bb237 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 10:08:48 +0100 Subject: [PATCH 02/13] Allow conditional use of order cycle sidebar We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it. --- app/views/checkout/edit.html.haml | 5 ++++- app/views/enterprises/shop.html.haml | 4 ++++ app/views/shopping_shared/_header.html.haml | 3 +-- app/views/spree/orders/edit.html.haml | 4 ++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 312b7b5a79..2f5d2afabe 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -7,7 +7,6 @@ .darkswarm.footer-pad - content_for :order_cycle_form do - %closing = t :checkout_now %p @@ -15,6 +14,10 @@ %strong = pickup_time current_order_cycle + - content_for :ordercycle_sidebar do + .show-for-large-up.large-4.columns + = render partial: "shopping_shared/order_cycles" + = render partial: "shopping_shared/header" %accordion{"close-others" => "false"} diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml index e08625d0df..7f98960b33 100644 --- a/app/views/enterprises/shop.html.haml +++ b/app/views/enterprises/shop.html.haml @@ -38,6 +38,10 @@ - if oc_select_options.count > 1 %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select + - content_for :ordercycle_sidebar do + .show-for-large-up.large-4.columns + = render partial: "shopping_shared/order_cycles" + = render partial: "shopping_shared/header" = render partial: "shopping_shared/tabs" diff --git a/app/views/shopping_shared/_header.html.haml b/app/views/shopping_shared/_header.html.haml index 03661a22ea..e718e9247c 100644 --- a/app/views/shopping_shared/_header.html.haml +++ b/app/views/shopping_shared/_header.html.haml @@ -10,5 +10,4 @@ = distributor.name %location= distributor.address.city - .show-for-large-up.large-4.columns - = render partial: "shopping_shared/order_cycles" + = yield :ordercycle_sidebar diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index 56f4e03ef8..e1ded2b7a8 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -16,6 +16,10 @@ - else = @order.distributor.next_collection_at + - content_for :ordercycle_sidebar do + .show-for-large-up.large-4.columns + = render partial: "shopping_shared/order_cycles" + = render partial: "shopping_shared/header" %fieldset.footer-pad From 81537d92cf870cd90cef5fbf7fed851ee4301dac Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 11:22:47 +0100 Subject: [PATCH 03/13] Extract styles for distributor header These styles are used in shop, cart, checkout, order confirmation. Not just shop. --- .../darkswarm/_shop-navigation.css.scss | 42 ------------------ .../darkswarm/distributor_header.css.scss | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 app/assets/stylesheets/darkswarm/distributor_header.css.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index fd08599222..ccc2e1b54d 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -1,47 +1,5 @@ @import "typography"; -.darkswarm navigation { - display: block; - background: $white; - - distributor.details { - box-sizing: border-box; - display: block; - min-height: 150px; - padding: 30px 0 20px 0; - position: relative; - - select { - width: 200px; - } - - img { - display: block; - height: 100px; - width: 100px; - margin-right: 12px; - } - - location { - @include headingFont; - } - @media all and (max-width: 768px) { - location, location + small { - display: block; - } - } - - #distributor_title h3 { - margin-top: 0; - padding-top: 0.45em; - - @media all and (max-width: 768px) { - margin-bottom: 8px; - } - } - } -} - ordercycle { float: right; background: $teal-400; diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss new file mode 100644 index 0000000000..fb1dc01a55 --- /dev/null +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -0,0 +1,43 @@ +@import "typography"; + +.darkswarm navigation { + display: block; + background: $white; + + distributor.details { + box-sizing: border-box; + display: block; + min-height: 150px; + padding: 30px 0 20px 0; + position: relative; + + select { + width: 200px; + } + + img { + display: block; + height: 100px; + width: 100px; + margin-right: 12px; + } + + location { + @include headingFont; + } + @media all and (max-width: 768px) { + location, location + small { + display: block; + } + } + + #distributor_title h3 { + margin-top: 0; + padding-top: 0.45em; + + @media all and (max-width: 768px) { + margin-bottom: 8px; + } + } + } +} From cff8f6dd96713b61a0c3a24d00f8aeeb4153e82b Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 11:23:44 +0100 Subject: [PATCH 04/13] Add box-shadow to distributor header for cart, checkout, and order confirmation pages --- .../stylesheets/darkswarm/distributor_header.css.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss index fb1dc01a55..d06ef83c4c 100644 --- a/app/assets/stylesheets/darkswarm/distributor_header.css.scss +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -1,5 +1,11 @@ @import "typography"; +section { + :not(shop) navigation { + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), 0 8px 6px -6px rgba(0, 0, 0, 0.2) + } +} + .darkswarm navigation { display: block; background: $white; From a3a26f704fa0975d998cfba2864b217eba5cb3d3 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 11:32:28 +0100 Subject: [PATCH 05/13] Extract re-used box-shadow style --- app/assets/stylesheets/darkswarm/branding.css.scss | 2 ++ app/assets/stylesheets/darkswarm/distributor_header.css.scss | 2 +- app/assets/stylesheets/darkswarm/shop_tabs.css.scss | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/branding.css.scss b/app/assets/stylesheets/darkswarm/branding.css.scss index 55401e0f24..c1b6ffdd6e 100644 --- a/app/assets/stylesheets/darkswarm/branding.css.scss +++ b/app/assets/stylesheets/darkswarm/branding.css.scss @@ -1,5 +1,7 @@ $ofn-brand: #f27052; +$distributor-header-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), 0 8px 6px -6px rgba(0, 0, 0, 0.2); + // e.g. australia, uk, norway specific color $ofn-grey: #808184; diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss index d06ef83c4c..6fb73d7186 100644 --- a/app/assets/stylesheets/darkswarm/distributor_header.css.scss +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -2,7 +2,7 @@ section { :not(shop) navigation { - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), 0 8px 6px -6px rgba(0, 0, 0, 0.2) + box-shadow: $distributor-header-shadow; } } diff --git a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss index a4c9c1f692..7eaf76afeb 100644 --- a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss +++ b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss @@ -7,7 +7,7 @@ .tab-buttons { color: $dark-grey; - box-shadow: 0 1px 0 rgba(0,0,0,0.05), 0 8px 6px -6px rgba(0, 0, 0, 0.2); + box-shadow: $distributor-header-shadow; .columns { display: flex; From 52ebd1b4028d183f6da749489deed697c5c0b97d Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 11:43:08 +0100 Subject: [PATCH 06/13] Remove order cycle popovers; these styles are no longer used --- .../darkswarm/_shop-popovers.css.scss | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-popovers.css.scss b/app/assets/stylesheets/darkswarm/_shop-popovers.css.scss index c1a4c8ffe3..d233284767 100644 --- a/app/assets/stylesheets/darkswarm/_shop-popovers.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-popovers.css.scss @@ -1,31 +1,6 @@ @import "mixins"; @import "branding"; -// .darkswarm -// product - -ordercycle { - .joyride-tip-guide { - background-color: $clr-brick; - - .joyride-nub.right { - border-color: $clr-brick !important; - border-top-color: transparent !important; - border-right-color: transparent !important; - border-bottom-color: transparent !important; - } - - p { - margin: 0; - font-weight: 700; - } - - @media all and (max-width: 768px) { - z-index: 10; - } - } -} - // Pop over // Foundation overrides .joyride-tip-guide.price_breakdown { From 7a3549209faff748651c1b2384d48a45ab2921b8 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 12:04:30 +0100 Subject: [PATCH 07/13] Use 4 columns on checkout sidebar --- app/views/checkout/edit.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 2f5d2afabe..35b9269a0f 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -22,12 +22,12 @@ %accordion{"close-others" => "false"} %checkout.row{"ng-controller" => "CheckoutCtrl"} - .small-12.medium-8.large-9.columns + .small-12.medium-8.columns - unless spree_current_user = render partial: "checkout/authentication" %div{"ng-show" => "enabled", "ng-controller" => "AccordionCtrl"} = render partial: "checkout/form" - .small-12.medium-4.large-3.columns + .small-12.medium-4.columns = render partial: "checkout/summary" From eb4d970bc7d2a069b0ba63b511d2ab681b443d88 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 12:43:31 +0100 Subject: [PATCH 08/13] Adjust positioning for order cycle sidebar --- .../darkswarm/_shop-navigation.css.scss | 15 ++++++++++----- .../darkswarm/distributor_header.css.scss | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index ccc2e1b54d..36a8d6b6d9 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -6,11 +6,8 @@ ordercycle { color: $white; width: 100%; border-radius: 0.5em 0.5em 0 0; - position: absolute; - right: 1em; - padding: 1em; - margin-top: 3em; - height: 7.6em; + margin-top: 1em; + padding: 1em 1em 0; &.requires-selection { background-color: $red-700; @@ -147,3 +144,11 @@ ordercycle { } } } + +shop navigation ordercycle { + margin-top: 3em; + padding: 1em; + height: 7.6em; + position: absolute; + right: 1em; +} diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss index 6fb73d7186..5e402580aa 100644 --- a/app/assets/stylesheets/darkswarm/distributor_header.css.scss +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -14,7 +14,7 @@ section { box-sizing: border-box; display: block; min-height: 150px; - padding: 30px 0 20px 0; + padding: 30px 0 0 0; position: relative; select { From a08020490d05b4593ae0068190253486965378bb Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 12:52:14 +0100 Subject: [PATCH 09/13] Define new colour and use variable where already in use --- app/assets/stylesheets/darkswarm/active_table_search.css.scss | 2 +- app/assets/stylesheets/darkswarm/branding.css.scss | 2 ++ app/assets/stylesheets/darkswarm/checkout.css.scss | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/active_table_search.css.scss b/app/assets/stylesheets/darkswarm/active_table_search.css.scss index 4159126538..b934116cdc 100644 --- a/app/assets/stylesheets/darkswarm/active_table_search.css.scss +++ b/app/assets/stylesheets/darkswarm/active_table_search.css.scss @@ -27,7 +27,7 @@ } products .filter-box { - background: #f7f7f7; + background: $grey-050; } .filter-box { diff --git a/app/assets/stylesheets/darkswarm/branding.css.scss b/app/assets/stylesheets/darkswarm/branding.css.scss index c1b6ffdd6e..b8ab72349c 100644 --- a/app/assets/stylesheets/darkswarm/branding.css.scss +++ b/app/assets/stylesheets/darkswarm/branding.css.scss @@ -41,6 +41,8 @@ $light-grey-transparency: rgba(0, 0, 0, .1); $black: #000; $white: #fff; +$grey-050: #f7f7f7; + $grey-400: #bbb; $grey-500: #999; $grey-600: #777; diff --git a/app/assets/stylesheets/darkswarm/checkout.css.scss b/app/assets/stylesheets/darkswarm/checkout.css.scss index 458fd24d5e..1ad32a975b 100644 --- a/app/assets/stylesheets/darkswarm/checkout.css.scss +++ b/app/assets/stylesheets/darkswarm/checkout.css.scss @@ -44,7 +44,7 @@ checkout { h5 { margin: 0; padding: 0.65em; - background: #f7f7f7; + background: $grey-050; .label { font-size: 1em; From 7daba62f430f57cb15d8a81c4184e9daa00b84da Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 13:01:24 +0100 Subject: [PATCH 10/13] Update colours for different order cycle sidebar cases --- .../darkswarm/_shop-navigation.css.scss | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index 36a8d6b6d9..2aff5bcac2 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -2,32 +2,13 @@ ordercycle { float: right; - background: $teal-400; - color: $white; + background: $grey-050; + color: $grey-800; width: 100%; border-radius: 0.5em 0.5em 0 0; margin-top: 1em; padding: 1em 1em 0; - &.requires-selection { - background-color: $red-700; - - .order-cycle-select { - border: 1px solid $red-500; - - .select-label { - background-color: rgba($red-500, 0.5); - } - - select { - background-color: $white; - background-image: url('/assets/black-caret.svg'); - color: $grey-500; - font-style: italic; - } - } - } - p { max-width: 400px; } @@ -119,7 +100,7 @@ ordercycle { closing { @include headingFont; - color: $white; + color: $grey-800; font-size: 1.25rem; display: block; padding: 0 0 12px; @@ -151,4 +132,29 @@ shop navigation ordercycle { height: 7.6em; position: absolute; right: 1em; + background: $teal-400; + color: $white; + + &.requires-selection { + background-color: $red-700; + + .order-cycle-select { + border: 1px solid $red-500; + + .select-label { + background-color: rgba($red-500, 0.5); + } + + select { + background-color: $white; + background-image: url('/assets/black-caret.svg'); + color: $grey-500; + font-style: italic; + } + } + } + + closing { + color: $white; + } } From b2ed69831beddd37720114ca730cb3d98f043b87 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 13:36:32 +0100 Subject: [PATCH 11/13] Adjust style contexts --- .../darkswarm/_shop-navigation.css.scss | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index 2aff5bcac2..c3d16aa4d1 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -33,14 +33,10 @@ ordercycle { } } - @media all and (max-width: 768px) { + @media all and (max-width: 480px) { padding: 0.5em 1em 0.75em; } - form.custom { - text-align: center; - } - .order-cycle-select { border: 1px solid $teal-300; display: inline-block; @@ -126,12 +122,7 @@ ordercycle { } } -shop navigation ordercycle { - margin-top: 3em; - padding: 1em; - height: 7.6em; - position: absolute; - right: 1em; +shop ordercycle { background: $teal-400; color: $white; @@ -157,4 +148,16 @@ shop navigation ordercycle { closing { color: $white; } + + form.custom { + text-align: center; + } +} + +shop navigation ordercycle { + margin-top: 3em; + padding: 1em; + height: 7.6em; + position: absolute; + right: 1em; } From c3283adcf5201146d41c701b735d6f2f260c13a7 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 14:25:04 +0100 Subject: [PATCH 12/13] Show full-width ordercycle subheader on tablet and below --- .../darkswarm/_shop-navigation.css.scss | 39 ++++++++++++------- .../darkswarm/distributor_header.css.scss | 2 + app/views/checkout/edit.html.haml | 3 ++ app/views/spree/orders/edit.html.haml | 3 ++ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index c3d16aa4d1..70ddb8c652 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -7,7 +7,7 @@ ordercycle { width: 100%; border-radius: 0.5em 0.5em 0 0; margin-top: 1em; - padding: 1em 1em 0; + padding: 1em 1.25em 0; p { max-width: 400px; @@ -99,20 +99,7 @@ ordercycle { color: $grey-800; font-size: 1.25rem; display: block; - padding: 0 0 12px; - - @media all and (max-width: 1024px) { - float: none; - display: inline-block; - padding: 0.2em 0 0; - font-size: 1.2em; - margin-right: 1em; - } - - @media all and (max-width: 768px) { - float: none; - padding: 0 0 10px; - } + padding: 0.5em 0 0.5em; span { @media all and (max-width: 768px) { @@ -147,6 +134,20 @@ shop ordercycle { closing { color: $white; + padding: 0 0 12px; + + @media all and (max-width: 1024px) { + float: none; + display: inline-block; + padding: 0.2em 0 0; + font-size: 1.2em; + margin-right: 1em; + } + + @media all and (max-width: 768px) { + float: none; + padding: 0 0 10px; + } } form.custom { @@ -161,3 +162,11 @@ shop navigation ordercycle { position: absolute; right: 1em; } + +.sub-header { + form { + p { + margin-bottom: 0.75em; + } + } +} diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss index 5e402580aa..1dbe38641d 100644 --- a/app/assets/stylesheets/darkswarm/distributor_header.css.scss +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -9,6 +9,8 @@ section { .darkswarm navigation { display: block; background: $white; + position: relative; + z-index: 2; distributor.details { box-sizing: border-box; diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 35b9269a0f..9d85b3e8df 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -20,6 +20,9 @@ = render partial: "shopping_shared/header" + .sub-header.show-for-medium-down + = render partial: "shopping_shared/order_cycles" + %accordion{"close-others" => "false"} %checkout.row{"ng-controller" => "CheckoutCtrl"} .small-12.medium-8.columns diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index e1ded2b7a8..f654cfebb1 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -22,6 +22,9 @@ = render partial: "shopping_shared/header" + .sub-header.show-for-medium-down + = render partial: "shopping_shared/order_cycles" + %fieldset.footer-pad - if @order.line_items.empty? %div.row{"data-hook" => "empty_cart"} From e63dbcfa898dd750d61cf87430c7541cfe12562b Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 25 Mar 2020 17:58:36 +0100 Subject: [PATCH 13/13] Fix some SCSS linting warnings --- app/assets/stylesheets/darkswarm/_shop-navigation.css.scss | 2 +- .../stylesheets/darkswarm/distributor_header.css.scss | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index 70ddb8c652..80c2bfe09a 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -99,7 +99,7 @@ ordercycle { color: $grey-800; font-size: 1.25rem; display: block; - padding: 0.5em 0 0.5em; + padding: 0.5em 0; span { @media all and (max-width: 768px) { diff --git a/app/assets/stylesheets/darkswarm/distributor_header.css.scss b/app/assets/stylesheets/darkswarm/distributor_header.css.scss index 1dbe38641d..8e3fdc2a9b 100644 --- a/app/assets/stylesheets/darkswarm/distributor_header.css.scss +++ b/app/assets/stylesheets/darkswarm/distributor_header.css.scss @@ -1,4 +1,4 @@ -@import "typography"; +@import 'typography'; section { :not(shop) navigation { @@ -12,11 +12,11 @@ section { position: relative; z-index: 2; - distributor.details { + .details { box-sizing: border-box; display: block; min-height: 150px; - padding: 30px 0 0 0; + padding: 30px 0 0; position: relative; select { @@ -33,6 +33,7 @@ section { location { @include headingFont; } + @media all and (max-width: 768px) { location, location + small { display: block;