From 44d7ae8b611ff1d00b91a3f9154d40659ec65e2b Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 31 Jul 2014 15:07:22 +1000 Subject: [PATCH] Tweak the markup for brice breakdown and percentage for styling --- .../templates/price_breakdown.html.haml | 29 ++++++++++++------- .../templates/price_percentage.html.haml | 3 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/templates/price_breakdown.html.haml b/app/assets/javascripts/templates/price_breakdown.html.haml index 518448f565..f9919b92ff 100644 --- a/app/assets/javascripts/templates/price_breakdown.html.haml +++ b/app/assets/javascripts/templates/price_breakdown.html.haml @@ -1,27 +1,36 @@ .joyride-tip-guide{bindonce: true, "ng-class" => "{ in: tt_isOpen, fade: tt_animation }"} - %span.joyride-nub.bottom + %span.joyride-nub.right .joyride-content-wrapper .collapsed{"ng-show" => "!expanded"} %price-percentage{percentage: 'variant.basePricePercentage'} - %a{"ng-click" => "expanded = !expanded"} Full price breakdown + %a{"ng-click" => "expanded = !expanded"} + Full price breakdown + %i.ofn-i_005-caret-down .expanded{"ng-show" => "expanded"} %ul - %li + %li.cost + .right {{ variant.base_price | currency }} Cost - %span {{ variant.base_price | currency }} %li{"bo-if" => "variant.fees.admin"} + .right {{ variant.fees.admin | currency }} Admin fee - %span {{ variant.fees.admin | currency }} %li{"bo-if" => "variant.fees.sales"} + .right {{ variant.fees.sales | currency }} Sales fee - %span {{ variant.fees.sales | currency }} %li{"bo-if" => "variant.fees.packing"} + .right {{ variant.fees.packing | currency }} Packing fee - %span {{ variant.fees.packing | currency }} %li{"bo-if" => "variant.fees.transport"} + .right {{ variant.fees.transport | currency }} Transport fee - %span {{ variant.fees.transport | currency }} - %a{"ng-click" => "expanded = !expanded"} Price graph - \= {{ variant.price | currency }} + %li + %strong + .right = {{ variant.price | currency }} +   + + %a{"ng-click" => "expanded = !expanded"} + Price graph + %i.ofn-i_006-caret-up + diff --git a/app/assets/javascripts/templates/price_percentage.html.haml b/app/assets/javascripts/templates/price_percentage.html.haml index ee1e8964a5..4982f63eb7 100644 --- a/app/assets/javascripts/templates/price_percentage.html.haml +++ b/app/assets/javascripts/templates/price_percentage.html.haml @@ -1,4 +1,5 @@ .progress + .right Fees .meter Cost - Fees +