From d038b44198a3052d101d5bb456b39314ffc50e70 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 17 Jan 2022 14:21:34 -0500
Subject: [PATCH 1/2] CSR-302: move certain scss files to avoid prepend
 duplications

---
 src/App.vue   | 8 ++++++++
 vue.config.js | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a44ab87b7..3d665312e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,11 @@
 <template>
   <router-view></router-view>
 </template>
+
+<style lang="scss">
+  @import "./node_modules/bootstrap/scss/bootstrap";
+  @import "@/styles/common-styles.scss";
+  @import "@/styles/common-button-styles.scss";
+  @import "@/styles/common-list-styles.scss";
+  @import "@/styles/common-typography-styles.scss";
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 9d9b2401b..0c1664eb5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,11 +14,6 @@ module.exports = {
         @import "./node_modules/bootstrap/scss/variables";
         @import "./node_modules/bootstrap/scss/mixins";
         @import "@/styles/mixins/customMixins";
-        @import "./node_modules/bootstrap/scss/bootstrap";
-        @import "@/styles/common-styles.scss";
-        @import "@/styles/common-button-styles.scss";
-        @import "@/styles/common-list-styles.scss";
-        @import "@/styles/common-typography-styles.scss";
         `,
       },
     },

From 045a77b11acf4214b8558000693b0890371cf0f0 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 17 Jan 2022 14:35:45 -0500
Subject: [PATCH 2/2] CSR-302: add comments and also put change on
 vue.release.config.js

---
 vue.config.js         | 1 +
 vue.release.config.js | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 0c1664eb5..316656ed1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,6 +8,7 @@ module.exports = {
     loaderOptions: {
       sass: {
         // Load Order Matters!!!
+        // Note: only include functions, variables and mixins here
         prependData: `
         @import "./node_modules/bootstrap/scss/functions";
         @import "@/styles/ux-variables.scss";
diff --git a/vue.release.config.js b/vue.release.config.js
index c4b18d5dd..43fffb47f 100644
--- a/vue.release.config.js
+++ b/vue.release.config.js
@@ -7,17 +7,13 @@ module.exports = {
     loaderOptions: {
       sass: {
         // Load Order Matters!!!
+        // Note: only include functions, variables and mixins here
         prependData: `
         @import "./node_modules/bootstrap/scss/functions";
         @import "@/styles/ux-variables.scss";
         @import "./node_modules/bootstrap/scss/variables";
         @import "./node_modules/bootstrap/scss/mixins";
-        @import "@/styles/mixins/customMixins";
-        @import "./node_modules/bootstrap/scss/bootstrap";
-        @import "@/styles/common-styles.scss";
-        @import "@/styles/common-button-styles.scss";
-        @import "@/styles/common-list-styles.scss";
-        @import "@/styles/common-typography-styles.scss";
+        @import "@/styles/mixins/customMixins"; 
         `,
       },
     },