Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion components/Header/Navigation/HeaderNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default defineComponent({
currentCategory.value = category;
};

const hasChildren = (category: CategoryTree) => Boolean(category?.children);
const hasChildren = (category: CategoryTree) => Boolean(category?.children?.length);

const setFocus = (event: MouseEvent & { target: HTMLElement }) => {
focusedElement = event.target;
Expand Down
4 changes: 4 additions & 0 deletions modules/catalog/product/components/ProductAddReviewForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ export default defineComponent({
margin-right: 0;
margin-bottom: 0;
}
textarea {
box-sizing: border-box;
width: 100%;
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/catalog/product/getters/productGetters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ export const getPrice = (product: ProductInterface): Price => {
export const getGallery = (product: Product, maxGallerySize = 4): MediaGalleryItem[] => {
const images = [];

if (!product?.media_gallery && !product?.configurable_product_options_selection?.media_gallery) {
if (!product?.media_gallery.length && !product?.configurable_product_options_selection?.media_gallery.length) {
return images;
}

const selectedGallery = product.configurable_product_options_selection?.media_gallery
const selectedGallery = product.configurable_product_options_selection?.media_gallery.length
? product.configurable_product_options_selection.media_gallery
: product.media_gallery;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
.message {
font-family: var(--font-family--primary);
line-height: 1.6;
font-size: var(--font-size--base);
margin: 0 0 var(--spacer-base);
}
@import "../../styles/shared.scss";

</style>
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,5 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
.message {
font-family: var(--font-family--primary);
line-height: 1.6;
font-size: var(--font-size--base);
margin: 0 0 var(--spacer-base);
}
@import "../../styles/shared.scss";
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,7 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
.message {
font-family: var(--font-family--primary);
line-height: 1.6;
font-size: var(--font-size--base);
margin: 0 0 var(--spacer-base);
}
@import "../../styles/shared.scss";

.addresses-list {
margin-bottom: var(--spacer-base);
Expand Down
8 changes: 1 addition & 7 deletions modules/customer/pages/MyAccount/MyNewsletter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,7 @@ export default defineComponent({
</script>

<style lang='scss' scoped>
.tab-orphan {
@include for-mobile {
--tabs-title-display: none;
--tabs-content-padding: 0;
--tabs-conent-border-width: 0;
}
}
@import '../styles/shared.scss';

.form {
&__element {
Expand Down
27 changes: 2 additions & 25 deletions modules/customer/pages/MyAccount/MyReviews.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
@import '../styles/shared.scss';

.no-reviews {
&__title {
margin: 0 0 var(--spacer-lg) 0;
Expand All @@ -98,31 +100,6 @@ export default defineComponent({
}
}

.tab-orphan {
@include for-mobile {
--tabs-title-display: none;
--tabs-content-padding: 0;
--tabs-conent-border-width: 0;
}
}

.message {
margin: 0 0 var(--spacer-2xl) 0;
font: var(--font-weight--light) var(--font-size--base) / 1.6
var(--font-family--primary);

&__link {
color: var(--c-primary);
--link-weight: var(--font-weight--medium);
--link-font-family: var(--font-family--primary);
--link-font-size: var(--font-size--base);
text-decoration: none;

&:hover {
color: var(--c-text);
}
}
}
.sf-review__rating {
width: 100%;
display: flex;
Expand Down
9 changes: 1 addition & 8 deletions modules/customer/pages/MyAccount/MyWishlist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,7 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
.tab-orphan {
@include for-mobile {
--tabs-title-display: none;
--tabs-content-padding: 0;
--tabs-conent-border-width: 0;
}
}
@import '../styles/shared.scss';

.main {
&.section {
Expand Down Expand Up @@ -459,7 +453,6 @@ export default defineComponent({
}

&__product-card {
--product-card-title-margin: var(--spacer-base) 0 0 0;
--product-card-title-font-weight: var(--font-weight--medium);
--product-card-title-margin: var(--spacer-xs) 0 0 0;
flex: 1 1 50%;
Expand Down
4 changes: 4 additions & 0 deletions modules/customer/pages/MyAccount/ResetPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ export default defineComponent({
margin: 0 0 var(--spacer-xl) 0;
}
}

.action {
display: flex;
align-items: center;
Expand All @@ -242,12 +243,15 @@ export default defineComponent({
margin: 0 0 0 var(--spacer-xs);
}
}

.action {
margin: var(--spacer-xl) 0 var(--spacer-xl) 0;
}

.checkbox {
margin-bottom: var(--spacer-2xl);
}

.bottom {
text-align: center;
margin-bottom: var(--spacer-lg);
Expand Down
26 changes: 26 additions & 0 deletions modules/customer/pages/styles/shared.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.tab-orphan {
@include for-mobile {
--tabs-title-display: none;
--tabs-content-padding: 0;
--tabs-conent-border-width: 0;
}
}

.message {
font-family: var(--font-family--primary);
line-height: 1.6;
font-size: var(--font-size--base);
margin: 0 0 var(--spacer-base);

&__link {
color: var(--c-primary);
--link-weight: var(--font-weight--medium);
--link-font-family: var(--font-family--primary);
--link-font-size: var(--font-size--base);
text-decoration: none;

&:hover {
color: var(--c-text);
}
}
}
1 change: 1 addition & 0 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export default () => {
],
i18n: {
country: 'US',
baseUrl: process.env.VSF_STORE_URL,
strategy: 'prefix',
locales: [
{
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/magento-theme",
"version": "1.0.1",
"version": "1.0.2",
"private": true,
"license": "MIT",
"homepage": "https://github.com/vuestorefront/magento2",
Expand Down Expand Up @@ -38,7 +38,7 @@
"@pinia/nuxt": "^0.1.9",
"@storefront-ui/vue": "^0.13.3",
"@vue-storefront/cache": "~2.7.1",
"@vue-storefront/magento-api": "^1.0.1",
"@vue-storefront/magento-api": "^1.0.2",
"@vue-storefront/middleware": "~2.7.1",
"@vue-storefront/nuxt": "~2.7.1",
"@vue-storefront/redis-cache": "^1.0.1",
Expand Down
14 changes: 7 additions & 7 deletions pages/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default defineComponent({
title: app.i18n.t('Colorful summer dresses are already in store'),
subtitle: app.i18n.t('SUMMER COLLECTION {year}', { year }),
buttonText: app.i18n.t('Learn more'),
imageSrc: '/homepage/bannerB',
imageSrc: '/homepage/bannerB.webp',
imageWidth: isDesktop ? 1240 : 328,
imageHeight: isDesktop ? 400 : 224,
imageConfig: {
Expand All @@ -120,9 +120,9 @@ export default defineComponent({
buttonText: app.i18n.t('Shop now'),
image: {
mobile:
'/homepage/bannerB',
'/homepage/bannerB.webp',
desktop:
'/homepage/bannerF',
'/homepage/bannerF.webp',
},
imageConfig: {
fit: 'cover',
Expand All @@ -141,7 +141,7 @@ export default defineComponent({
'Find stunning women\'s cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.',
),
buttonText: app.i18n.t('Shop now'),
image: '/homepage/bannerE',
image: '/homepage/bannerE.webp',
imageConfig: {
fit: 'cover',
width: isDesktop ? 496 : 328,
Expand All @@ -155,7 +155,7 @@ export default defineComponent({
slot: 'banner-C',
subtitle: app.i18n.t('T-Shirts'),
title: app.i18n.t('The Office Life'),
image: '/homepage/bannerC',
image: '/homepage/bannerC.webp',
imageConfig: {
fit: 'cover',
width: isDesktop ? 332 : 328,
Expand All @@ -169,7 +169,7 @@ export default defineComponent({
slot: 'banner-D',
subtitle: app.i18n.t('Summer Sandals'),
title: app.i18n.t('Eco Sandals'),
image: '/homepage/bannerG',
image: '/homepage/bannerG.webp',
imageConfig: {
fit: 'cover',
width: isDesktop ? 332 : 328,
Expand All @@ -184,7 +184,7 @@ export default defineComponent({
title: app.i18n.t('Subscribe to Newsletters'),
description: app.i18n.t('Be aware of upcoming sales and events. Receive gifts and special offers!'),
buttonText: app.i18n.t('Subscribe'),
imageSrc: '/homepage/newsletter',
imageSrc: '/homepage/newsletter.webp',
imageWidth: isDesktop ? 1240 : 400,
imageHeight: isDesktop ? 202 : 200,
imageConfig: {
Expand Down
Loading