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

Jump to bottom

feat(default-theme): show order summary on mobile #1182

Merged
merged 8 commits into from
Oct 15, 2020
Merged

feat(default-theme): show order summary on mobile #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1774853
Merge pull request #1 from DivanteLtd/master
niklaswolf Sep 21, 2020
e62deee
Merge pull request #2 from DivanteLtd/master
niklaswolf Sep 22, 2020
1196cec
Merge remote-tracking branch 'upstream/master'
niklaswolf Sep 28, 2020
250bab4
Merge remote-tracking branch 'upstream/master'
niklaswolf Oct 5, 2020
d53ddaa
Merge remote-tracking branch 'upstream/master'
niklaswolf Oct 6, 2020
3844a85
Merge remote-tracking branch 'upstream/master'
niklaswolf Oct 14, 2020
8044e6c
feat: added order summary section in checkout on mobile
niklaswolf Oct 14, 2020
43fb7ac
Merge remote-tracking branch 'upstream/master' into 1173-totals-for-m…
niklaswolf Oct 15, 2020
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
25 changes: 19 additions & 6 deletions packages/default-theme/src/components/checkout/sidebar/SidebarOrderSummary.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
<SfProperty
:name="$t('Products')"
:value="count"
class="sf-property--full-width sf-property--large property"
class="sf-property--full-width property"
/>
<SfProperty
:name="$t('Subtotal')"
:value="subtotal | price"
class="sf-property--full-width sf-property--large property"
class="sf-property--full-width property"
/>
<SfProperty
:name="$t('Shipping')"
:value="shippingMethod.price | price"
class="sf-property--full-width sf-property--large property"
class="sf-property--full-width property"
/>
<SfDivider class="divider" />
<SfProperty
:name="$t('Total')"
:value="totalPrice | price"
class="sf-property--full-width sf-property--large property"
class="sf-property--full-width property"
/>
<SwPromoCode class="promo-code" />
<div class="characteristics">
Expand Down Expand Up @@ -102,7 +102,12 @@ export default {
<style lang="scss" scoped>
@import "@/assets/scss/variables";
.title {
--heading-title-margin: 0 0 var(--spacer-xl) 0;
--heading-title-margin: 0 0 var(--spacer-sm) 0;
--heading-title-font-weight: var(--font-bold);
@include for-desktop {
--heading-title-font-weight: var(--font-medium);
--heading-title-margin: 0 0 var(--spacer-xl) 0;
}
}
.total-items {
display: flex;
Expand All @@ -111,7 +116,15 @@ export default {
margin-bottom: var(--spacer-base);
}
.property {
margin: var(--spacer-base) 0;
margin: var(--spacer-sm) 0;
--property-name-font-size: var(--font-lg);
--property-value-font-size: var(--font-lg);
--property-value-font-weight: var(--font-semibold);
@include for-desktop {
margin: var(--spacer-base) 0;
--property-name-font-size: var(--font-xl);
--property-value-font-size: var(--font-xl);
}
}
.divider {
--divider-border-color: var(--c-white);
Expand Down
9 changes: 7 additions & 2 deletions packages/default-theme/src/pages/_lang/checkout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</SfStep>
</SfSteps>
</div>
<div class="checkout__aside desktop-only">
<div class="checkout__aside">
<transition name="fade">
<SidebarOrderSummary
v-if="currentStep < CHECKOUT_STEPS.REVIEW"
Expand Down Expand Up @@ -116,7 +116,12 @@ export default {
width: 100%;
box-shadow: 0px 4px 11px rgba(var(--c-dark-base), 0.1);
background: var(--c-light);
padding: var(--spacer-xl) calc(var(--spacer-lg) * 2);
padding: var(--spacer-sm);
box-sizing: border-box;
@include for-desktop {
box-sizing: content-box;
padding: var(--spacer-xl) calc(var(--spacer-lg) * 2);
}
}
}
}
Expand Down