diff --git a/web/app/assets/javascripts/helpBubbleHelper.js b/web/app/assets/javascripts/helpBubbleHelper.js index a43800e0e..47d2c4efb 100644 --- a/web/app/assets/javascripts/helpBubbleHelper.js +++ b/web/app/assets/javascripts/helpBubbleHelper.js @@ -31,7 +31,7 @@ spikeGirth: 15, spikeLength: 20, fill: 'white', - cornerRadius:4, + cornerRadius:8, strokeWidth: 2, cssStyles: { fontWeight:'bold', diff --git a/web/app/assets/stylesheets/client/shoppingCart.css.scss b/web/app/assets/stylesheets/client/shoppingCart.css.scss index ba3b31146..082e04ca8 100644 --- a/web/app/assets/stylesheets/client/shoppingCart.css.scss +++ b/web/app/assets/stylesheets/client/shoppingCart.css.scss @@ -1,12 +1,10 @@ #shoppingCartScreen { .content-body { - padding: 50px 20px 20px 20px; - overflow: scroll; .shopping-cart-content { - //padding-top: 20px; + padding: 50px 20px 20px 20px; margin-bottom: 20px; - overflow: scroll; + overflow: hidden; } .checkout-image { @@ -63,7 +61,7 @@ width: 65%; float: left; text-align: right; - margin-bottom: 20px; + margin: 10px 0 20px; font-weight: bold; font-size: 17px; } diff --git a/web/app/views/clients/_shopping_cart.html.haml b/web/app/views/clients/_shopping_cart.html.haml index f34be6584..8cc2a64b2 100644 --- a/web/app/views/clients/_shopping_cart.html.haml +++ b/web/app/views/clients/_shopping_cart.html.haml @@ -5,7 +5,8 @@ %h1 shopping cart = render "screen_navigation" .content-body - .shopping-cart-content + .content-body-scroller + .shopping-cart-content %script{type: 'text/template', id: 'template-shopping-cart-header'} .checkout-image= image_tag "content/checkmark.png", {:height => 32}