diff --git a/app/views/shopping_shared/_header.html.haml b/app/views/shopping_shared/_header.html.haml index af28612ded..03661a22ea 100644 --- a/app/views/shopping_shared/_header.html.haml +++ b/app/views/shopping_shared/_header.html.haml @@ -2,14 +2,13 @@ %navigation %distributor.details.row - .small-12.medium-6.large-6.columns + .small-12.medium-12.large-8.columns #distributor_title - if distributor.logo? %img.left{src: distributor.logo.url(:thumb)} %h3 = distributor.name %location= distributor.address.city - / Will this needs to be a drop-down to choose either pick-up point or delivery once shipping methods are implemented - .small-12.medium-6.large-6.columns + .show-for-large-up.large-4.columns = render partial: "shopping_shared/order_cycles" diff --git a/app/views/shopping_shared/tabs/_home.html.haml b/app/views/shopping_shared/tabs/_home.html.haml index c02d64692e..7e6fbe53f6 100644 --- a/app/views/shopping_shared/tabs/_home.html.haml +++ b/app/views/shopping_shared/tabs/_home.html.haml @@ -1,3 +1,6 @@ %script{ type: "text/ng-template", id: "shop/home.html" } + .order-cycle-bar.hide-for-large-up.small-12.columns + = render partial: "shopping_shared/order_cycles" + .content = render partial: 'shop/messages' diff --git a/app/views/shopping_shared/tabs/_shop.html.haml b/app/views/shopping_shared/tabs/_shop.html.haml index 7352cd0a3b..048315c290 100644 --- a/app/views/shopping_shared/tabs/_shop.html.haml +++ b/app/views/shopping_shared/tabs/_shop.html.haml @@ -1,4 +1,7 @@ %script{ type: "text/ng-template", id: "shop/shop.html" } + .order-cycle-bar.hide-for-large-up.small-12.columns + = render partial: "shopping_shared/order_cycles" + .row .small-12.columns - if no_open_order_cycles?