Skip to content

refactor: remove style duplication in my account route components #1310

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

Merged
merged 1 commit into from
Jul 29, 2022
Merged

refactor: remove style duplication in my account route components #1310

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
8 changes: 2 additions & 6 deletions packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue
View file
Open in desktop
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>
7 changes: 1 addition & 6 deletions packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue
View file
Open in desktop
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>
7 changes: 1 addition & 6 deletions packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue
View file
Open in desktop
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 packages/theme/modules/customer/pages/MyAccount/MyNewsletter.vue
View file
Open in desktop
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 packages/theme/modules/customer/pages/MyAccount/MyReviews.vue
View file
Open in desktop
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 packages/theme/modules/customer/pages/MyAccount/MyWishlist.vue
View file
Open in desktop
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 packages/theme/modules/customer/pages/MyAccount/ResetPassword.vue
View file
Open in desktop
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 packages/theme/modules/customer/pages/styles/shared.scss
View file
Open in desktop
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);
}
}
}