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.

Sign up for GitHub

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

Checkout confirm step and order summary styling fixes #10710

Merged
merged 1 commit into from
Jan 26, 2021
Merged

Checkout confirm step and order summary styling fixes #10710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
display: flex;
flex-direction: column;

div:first-child {
flex-basis: 100%;
}

&-order-details {
padding-bottom: 40px;
font-weight: 500;
Expand Down Expand Up @@ -35,6 +31,9 @@
}

&-line-items {
@include media-breakpoint-down(sm) {
flex-basis: 100%;
}
@include media-breakpoint-up(lg) {
border: none;
flex: 1 1 0;
Expand Down Expand Up @@ -65,6 +64,10 @@
border-top: 1px solid $global-border-style;
margin-right: 20px;

&-image {
padding-right: 16px;
}

&-link {
max-width: 50%;

Expand Down
3 changes: 3 additions & 0 deletions frontend/app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@
}
#checkout-summary {
margin-top: 30px;
@include media-breakpoint-down(sm) {
flex-basis: 100%;
}
@include media-breakpoint-up(sm) {
margin-top: 75px;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/app/views/spree/shared/_order_details.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</dl>
</div>

<div class="checkout-confirm-order-details-line-items d-flex flex-column mt-5 mr-4">
<div class="checkout-confirm-order-details-line-items d-flex flex-column mt-5 mr-md-4">
<div class="checkout-confirm-order-details-line-items-header d-none d-sm-block d-lg-none align-self-start mb-3">
<%= Spree.t(:products) %>
</div>
Expand All @@ -74,7 +74,7 @@
<div class="checkout-confirm-order-details-line-items-line-item w-100 d-table-row" data-hook="order_details_line_item_row">
<div class="checkout-confirm-order-details-line-items-line-item-name d-table-cell align-middle py-3 py-sm-4">
<div class="d-flex align-items-lg-center">
<div data-hook="order_item_image">
<div class="checkout-confirm-order-details-line-items-line-item-name-image" data-hook="order_item_image">
<%= link_to product_image(item.variant), item.product %>
</div>
<div class="d-flex flex-column mt-2 mt-lg-0" data-hook="order_item_description">
Expand Down