From 2d25bd8a45959c4ab5dd27a99f9f5bdfe2b70aa7 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 24 Jul 2014 10:57:37 +1000 Subject: [PATCH 1/2] Adding checkout button back to the top as a stop gap measure --- app/views/shop/products/_master.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shop/products/_master.html.haml b/app/views/shop/products/_master.html.haml index 249ba65b55..9b63fe7838 100644 --- a/app/views/shop/products/_master.html.haml +++ b/app/views/shop/products/_master.html.haml @@ -47,7 +47,7 @@ %i.ofn-i_009-close {{ product.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 From 6961a2ad007489635f18124da17d123ab0abd294 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 24 Jul 2014 10:58:08 +1000 Subject: [PATCH 2/2] Take the pop overs out of the tabindex --- app/views/shop/products/_form.html.haml | 6 +++--- app/views/shop/products/_variants.html.haml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index 3885f948bd..d29258769f 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -4,7 +4,7 @@ = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do .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", @@ -12,8 +12,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", diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml index fd9548b773..98a7d04335 100644 --- a/app/views/shop/products/_variants.html.haml +++ b/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