refactor: remove style duplication in my account route components

vuestorefront · Jul 27, 2022 · 82cf938 · 82cf938
1 parent aa47add
commit 82cf938
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 58 deletions.
diff --git a/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue b/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue
@@ -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>
diff --git a/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue b/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue
@@ -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>
diff --git a/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue b/packages/theme/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue
@@ -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);

diff --git a/packages/theme/modules/customer/pages/MyAccount/MyNewsletter.vue b/packages/theme/modules/customer/pages/MyAccount/MyNewsletter.vue
@@ -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 {

diff --git a/packages/theme/modules/customer/pages/MyAccount/MyReviews.vue b/packages/theme/modules/customer/pages/MyAccount/MyReviews.vue
@@ -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;
@@ -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;

diff --git a/packages/theme/modules/customer/pages/MyAccount/MyWishlist.vue b/packages/theme/modules/customer/pages/MyAccount/MyWishlist.vue
@@ -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 {
@@ -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%;

diff --git a/packages/theme/modules/customer/pages/MyAccount/ResetPassword.vue b/packages/theme/modules/customer/pages/MyAccount/ResetPassword.vue
@@ -232,6 +232,7 @@ export default defineComponent({
     margin: 0 0 var(--spacer-xl) 0;
   }
 }
+
 .action {
   display: flex;
   align-items: center;
@@ -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);

diff --git a/packages/theme/modules/customer/pages/styles/shared.scss b/packages/theme/modules/customer/pages/styles/shared.scss
@@ -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);
+    }
+  }
+}