Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will

Conflicts:
	app/views/shop/products/_master.html.haml

app/views/shop/products/_form.html.haml

@@ -3,7 +3,7 @@
 
   %form.custom
     .row
-      .small-12.columns
+      .small-12.medium-8.large-9.columns
         %input#search.text{"ng-model" => "query", 
         placeholder: "Search by product or producer",
         "ng-debounce" => "100",
@@ -11,8 +11,8 @@
 
         = render partial: "shop/products/filters"
 
-      / .small-12.medium-4.large-4.columns
-      /   %input.button.primary.right{type: :submit, value: "Checkout now"}
+      .small-12.medium-4.large-3.columns
+        %input.button.primary.right.add_to_cart{type: :submit, value: "Checkout now"}
 
     %div.pad-top{bindonce: true}
       %product.animate-repeat{"ng-controller" => "ProductNodeCtrl",

app/views/shop/products/_master.html.haml

@@ -47,7 +47,6 @@
   .table-cell
     %i.ofn-i_009-close
     {{ product.price | currency }}
-    {{ $id }} 
     %button.graph-button{"price-breakdown" => "_",
       "variant" => "product.master",
       "price-breakdown-animation" => "true"}

app/views/shop/products/_variants.html.haml

@@ -51,7 +51,7 @@
       %i.ofn-i_009-close 
       {{ variant.price | currency }}
 
-      %button.graph-button{popover: "This is the popover text", "popover-title" => "The title.", "popover-animation" => "true", "popover-trigger" =>"mouseenter", "popover-placement" => "top"}
+      %button.graph-button{popover: "This is the popover text", "popover-title" => "The title.", "popover-animation" => "true", "popover-trigger" =>"mouseenter", "popover-placement" => "top", "tabindex" => "-1"}
         %i.ofn-i-058-graph
 
   .small-12.medium-2.large-2.columns.total-price.text-right