Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Design optimizations in cart and checkout #5882

Merged
merged 4 commits into from Jul 22, 2016
Merged

Design optimizations in cart and checkout #5882

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce3171c
FO : Bigger unit_price in shopping cart page BOOM-1085
paeddl Jul 20, 2016
08b3d64
FO : final order summary below optins - BOOM-1098
paeddl Jul 21, 2016
f06fd11
FO : improved cart design in final summary BOOM-1096
paeddl Jul 21, 2016
222b363
Fix indent
paeddl Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions themes/classic/_dev/css/components/cart.scss
View file
Open in desktop
Expand Up @@ -107,6 +107,11 @@
> .available {
color: $brand-success;
}
> .unit-price-cart {
padding-left: 0.3125rem;
font-size: 0.875rem;
color: $gray-dark;
}
}
}
/** CONTENT LEFT **/
Expand Down
33 changes: 30 additions & 3 deletions themes/classic/_dev/css/components/checkout.scss
View file
Open in desktop
Expand Up @@ -122,6 +122,9 @@ body#checkout {
.form-footer {
text-align: center;
}
#conditions-to-approve {
padding-top: rem(30px);
}
.payment-option label {
display: table-cell;
}
Expand Down Expand Up @@ -255,11 +258,11 @@ body#checkout {
}
}
#order-summary-content {
padding-top: rem(25px);
padding-top: rem(15px);
h4.h4 {
margin-top: rem(10px);
margin-bottom: rem(20px);
color: $gray;
color: $gray-darker;
}
h4.black {
color: #000000;
Expand All @@ -273,12 +276,36 @@ body#checkout {
#order-items {
border-right: 0;
h3.h3 {
color: $gray;
color: $gray-darker;
margin-top: rem(20px);
}
table {
tr {
&:first-child {
td {
border-top: 0;
}
}
}
}
}
.order-confirmation-table {
padding: 1rem;
margin-bottom: 2rem;
background-color: #fff;
border: 1px solid #e5e5e5;
border-radius: 0;
}
.summary-selected-carrier {
margin-bottom: 0.75rem;
background-color: #fff;
border: 1px solid #e5e5e5;
border-radius: 0;
padding: 1rem;
}
.step-edit {
display: inline;
color: $gray;
}
.step-edit:hover {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion themes/classic/templates/checkout/_partials/cart-detailed-product-line.tpl
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
<div class="product-line-info">
<span class="value">{$product.price}</span>
{if $product.unit_price_full}
<small class="sub">{$product.unit_price_full}</small>
<div class="unit-price-cart">{$product.unit_price_full}</div>
{/if}
</div>

Expand Down
2 changes: 2 additions & 0 deletions themes/classic/templates/checkout/_partials/order-confirmation-table.tpl
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@
<div id="order-items" class="col-md-8">
<h3 class="card-title h3">{l s='Order items' d='Shop.Theme.Checkout'}</h3>
{/block}
<div class="order-confirmation-table">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad indent. Could you fix it, please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maximebiloe done:
222b363

<table class="table">
{foreach from=$products item=product}
<tr>
Expand Down Expand Up @@ -80,3 +81,4 @@
</tr>
</table>
</div>
</div>
2 changes: 1 addition & 1 deletion themes/classic/templates/checkout/_partials/order-final-summary.tpl
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
<span class="step-edit step-to-delivery"><i class="material-icons edit">mode_edit</i> edit</span>
</h4>

<div class="col-md-12">
<div class="col-md-12 summary-selected-carrier">
<div class="row">
<div class="col-md-2">
<div class="logo-container">
Expand Down
8 changes: 4 additions & 4 deletions themes/classic/templates/checkout/_partials/steps/payment.tpl
View file
Open in desktop
Expand Up @@ -70,10 +70,6 @@
{/foreach}
</div>

{if $show_final_summary}
{include file='checkout/_partials/order-final-summary.tpl'}
{/if}

{if $conditions_to_approve|count}
<p class="ps-hidden-by-js">
{* At the moment, we're not showing the checkboxes when JS is disabled
Expand Down Expand Up @@ -110,6 +106,10 @@
</form>
{/if}

{if $show_final_summary}
{include file='checkout/_partials/order-final-summary.tpl'}
{/if}

<div id="payment-confirmation">
<div class="ps-shown-by-js">
<button type="submit" {if !$selected_payment_option} disabled {/if} class="btn btn-primary center-block">
Expand Down