diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass index 0c2972367a..a23458b941 100644 --- a/app/assets/stylesheets/darkswarm/shop.css.sass +++ b/app/assets/stylesheets/darkswarm/shop.css.sass @@ -27,7 +27,6 @@ margin-right: 12px location font-family: "AvenirBla_IE", "AvenirBla" - padding-right: 16px @media all and (max-width: 768px) location, location + small display: block @@ -58,21 +57,23 @@ @media all and (max-width: 768px) font-size: 1.2em select - width: 280px + width: inherit display: inline-block vackground: transparent - border-width: 2px - border-color: #666666 + border-width: 1px + border-color: #999 + color: #666 font-size: 1em margin-bottom: 0 - padding: 8px 0px 8px 12px + padding: 8px 20px 8px 12px @media all and (max-width: 768px) font-size: 1.2em - width: 180px + // width: 180px closing - font-size: 0.875em + color: black + font-size: 1.5em display: block - padding-top: 14px + padding-bottom: 20px products display: block diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml index d4b36a5e29..ad0080edae 100644 --- a/app/views/shop/show.html.haml +++ b/app/views/shop/show.html.haml @@ -2,15 +2,20 @@ - content_for :order_cycle_form do %div{"ng-controller" => "OrderCycleChangeCtrl"} - %strong.avenir Ready for + %closing{"ng-if" => "OrderCycle.selected()"} + Next order closing + %strong {{ OrderCycle.orders_close_at() | date_in_words }} + + %span Ready for pickup + + / Will this label should be a variable to reflect pickup or delivery as appropriate + %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", "ng-change" => "changeOrderCycle()", "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}", "popover-placement" => "bottom", "popover" => "When do you want to get your order?", "popover-trigger" => "openTrigger"} - %closing{"ng-if" => "OrderCycle.selected()"} - Orders close - %strong {{ OrderCycle.orders_close_at() | date_in_words }} + = render partial: "shopping_shared/details" diff --git a/app/views/shopping_shared/_details.html.haml b/app/views/shopping_shared/_details.html.haml index 37edfa3c16..8a1692ebb1 100644 --- a/app/views/shopping_shared/_details.html.haml +++ b/app/views/shopping_shared/_details.html.haml @@ -4,11 +4,10 @@ %distributor.details.row #distributor_title %img.left{src: current_distributor.logo.url(:thumb)} - %h4 + %h3 = current_distributor.name %location= current_distributor.address.city - %small - %a{href: "/"} Change location + / Will this needs to be a drop-down to choose either pick-up point or delivery once shipping methods are implemented = render partial: "shopping_shared/order_cycles"