diff --git a/jest.config.js b/jest.config.js index 8b510e95c..7a6fcbc01 100644 --- a/jest.config.js +++ b/jest.config.js @@ -12,6 +12,7 @@ module.exports = { "!src/router/**/*.js", "!src/helpers/unit-test-helper.js", "!src/layouts/component-test/component-test.vue", + "!src/layouts/form-test/form-test.vue", "!src/layouts/address-poc/address-poc.vue" ], //! means exclude from coverage. testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"], diff --git a/package-lock.json b/package-lock.json index f0cf0ac10..bfc6c1f68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,11 +15,13 @@ "core-js": "^3.6.5", "http-status-codes": "^2.1.4", "jest-junit": "^13.0.0", + "vee-validate": "^4.5.7", "vue": "^3.0.0", "vue-plugin-load-script": "^2.1.0", "vue-router": "^4.0.11", "vuex": "^4.0.2", - "vuex-persistedstate": "^4.1.0" + "vuex-persistedstate": "^4.1.0", + "yup": "^0.32.11" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", @@ -1632,7 +1634,6 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -4166,6 +4167,11 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "node_modules/@types/lodash": { + "version": "4.14.178", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz", + "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==" + }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -16453,8 +16459,12 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -16974,6 +16984,11 @@ "dev": true, "optional": true }, + "node_modules/nanoclone": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", + "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==" + }, "node_modules/nanoid": { "version": "3.1.30", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", @@ -18974,6 +18989,11 @@ "node": ">= 6" } }, + "node_modules/property-expr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz", + "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==" + }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -19352,8 +19372,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "node_modules/regenerator-transform": { "version": "0.14.5", @@ -22340,6 +22359,17 @@ "node": ">= 0.8" } }, + "node_modules/vee-validate": { + "version": "4.5.7", + "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-4.5.7.tgz", + "integrity": "sha512-EcpvOikBP5LlRIKwULfwRDeyIaERuOJztZUPWRmSIeWpeQWD6hs9qQ8A3CmVVteqEohbUM07gV/ea8lPXCfCJQ==", + "dependencies": { + "@vue/devtools-api": "^6.0.0-beta.15" + }, + "peerDependencies": { + "vue": "^3.0.0" + } + }, "node_modules/vendors": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", @@ -24319,6 +24349,28 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true + }, + "node_modules/yup": { + "version": "0.32.11", + "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz", + "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==", + "dependencies": { + "@babel/runtime": "^7.15.4", + "@types/lodash": "^4.14.175", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "nanoclone": "^0.2.1", + "property-expr": "^2.0.4", + "toposort": "^2.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yup/node_modules/toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=" } }, "dependencies": { @@ -25421,7 +25473,6 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -27496,6 +27547,11 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "@types/lodash": { + "version": "4.14.178", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz", + "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==" + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -37445,8 +37501,12 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "lodash.debounce": { "version": "4.0.8", @@ -37888,6 +37948,11 @@ "dev": true, "optional": true }, + "nanoclone": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", + "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==" + }, "nanoid": { "version": "3.1.30", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", @@ -39538,6 +39603,11 @@ "sisteransi": "^1.0.5" } }, + "property-expr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz", + "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==" + }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -39856,8 +39926,7 @@ "regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "regenerator-transform": { "version": "0.14.5", @@ -42300,6 +42369,14 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, + "vee-validate": { + "version": "4.5.7", + "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-4.5.7.tgz", + "integrity": "sha512-EcpvOikBP5LlRIKwULfwRDeyIaERuOJztZUPWRmSIeWpeQWD6hs9qQ8A3CmVVteqEohbUM07gV/ea8lPXCfCJQ==", + "requires": { + "@vue/devtools-api": "^6.0.0-beta.15" + } + }, "vendors": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", @@ -43914,6 +43991,27 @@ "dev": true } } + }, + "yup": { + "version": "0.32.11", + "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz", + "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==", + "requires": { + "@babel/runtime": "^7.15.4", + "@types/lodash": "^4.14.175", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "nanoclone": "^0.2.1", + "property-expr": "^2.0.4", + "toposort": "^2.0.2" + }, + "dependencies": { + "toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=" + } + } } } } diff --git a/package.json b/package.json index 6033a0009..ee8fdeb88 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,13 @@ "core-js": "^3.6.5", "http-status-codes": "^2.1.4", "jest-junit": "^13.0.0", + "vee-validate": "^4.5.7", "vue": "^3.0.0", "vue-plugin-load-script": "^2.1.0", "vue-router": "^4.0.11", "vuex": "^4.0.2", - "vuex-persistedstate": "^4.1.0" + "vuex-persistedstate": "^4.1.0", + "yup": "^0.32.11" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", diff --git a/public/index.html b/public/index.html index 35da253dd..b926ca739 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - + <%= htmlWebpackPlugin.options.title %> 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 @@ + + \ No newline at end of file diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index 849f5a353..d96886088 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -1,28 +1,38 @@ diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue index 68d23bc16..bb50872d6 100644 --- a/src/layouts/vehicle-model/model-question/model-question.vue +++ b/src/layouts/vehicle-model/model-question/model-question.vue @@ -3,6 +3,9 @@ :questionText="questionText" :answers="models" groupName="Choose Vehicle Model" + textPosition="text-start" + :isVehicleQuestion="true" + :loaderEnabled="true" v-model="modelValue" /> diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue index a9bbd9fbf..d14b39599 100644 --- a/src/layouts/vehicle-style/style-question/style-question.vue +++ b/src/layouts/vehicle-style/style-question/style-question.vue @@ -3,6 +3,9 @@ :questionText="questionText" :answers="styles" groupName="Choose Vehicle Style" + textPosition="text-start" + :isVehicleQuestion="true" + :loaderEnabled="true" v-model="modelValue" /> diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue index 6399abb0c..98538a361 100644 --- a/src/layouts/vehicle-year/year-question/year-question.vue +++ b/src/layouts/vehicle-year/year-question/year-question.vue @@ -3,6 +3,9 @@ :questionText="questionText" :answers="years" groupName="Choose Vehicle Year" + :isVehicleQuestion="true" + textPosition="text-start" + :loaderEnabled="true" v-model="modelValue" /> diff --git a/src/router/index.js b/src/router/index.js index b1aa88493..7633f9d1a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,9 +3,8 @@ import { storeActions } from "@/constants/store-actions.js"; import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"; import { routingTable } from "@/router/router-constants/routing-table.js"; import ComponentTest from "@/layouts/component-test/component-test.vue"; - +import FormTest from "@/layouts/form-test/form-test.vue"; import AddressPOC from "@/layouts/address-poc/address-poc.vue"; - import NotFound from "@/layouts/not-found/not-found.vue"; import store from "@/store"; @@ -20,6 +19,11 @@ const routes = [ name: "ComponentTest", component: ComponentTest, }, + { + path: "/form-test", // This is a temporary route for testing. + name: "FormTest", + component: FormTest, + }, { path: "/address-poc", // This is a temporary route for testing. name: "AddressPOC", diff --git a/src/styles/common-list-styles.scss b/src/styles/common-list-styles.scss index d1a27d428..2af95f21a 100644 --- a/src/styles/common-list-styles.scss +++ b/src/styles/common-list-styles.scss @@ -12,6 +12,8 @@ box-shadow: 0 0 0 2px $blue; } &:checked + label { + color: $black; + font-weight: 500; background: $blue-100; box-shadow: 0 0 0 1px $blue; } @@ -20,6 +22,7 @@ } } label { + color: $gray-600; position: relative; background: $white; transition: all 150ms linear; diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 5e1993716..ba18099ff 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -14,8 +14,35 @@ body { color: $blue; text-decoration: none; border-bottom: 1px solid $blue; + line-height: 26px; + padding: 0 0 4px 0; + font-weight: 500; &:hover { - color: $blue-400; + color: $blue-700; + } + &.small { + line-height: 24px; + &:hover { + color: $blue-700; + } + } + &.navigation-link { + color: $black; + border-bottom: 1px solid $black; + line-height: 26px; + } + &.footer-link { + color: $gray-500; + text-decoration: none; + border-bottom: 1px solid transparent; + line-height: 20px; + padding: 0 0 2px 0; + font-weight: 400; + font-size: .75rem; + &:hover { + border-bottom: 1px solid $gray-500; + padding: 0 0 2px 0; + } } } .pointer { diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js index e6d47f3fb..91e4e1f6c 100644 --- a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js +++ b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js @@ -183,37 +183,4 @@ describe("list-button-horizontal.vue", () => { }); - it("Should return first item if first item in group", async () => { - // Act - const wrapper = shallowMount(listButtonHorizontal, { - propsData: { - positionInGroup: 1 - }, - }); - - // Assert - - const label = wrapper.find("label"); - - expect(label.attributes('class')).toContain("first-item"); - - }); - - it("Should return last item if last item in group", async () => { - // Act - const wrapper = shallowMount(listButtonHorizontal, { - propsData: { - positionInGroup: 3, - totalInGroup: 3 - }, - }); - - // Assert - - const label = wrapper.find("label"); - - expect(label.attributes('class')).toContain("last-item"); - - }); - }); diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue index c4f8d995c..9bdeee4b8 100644 --- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue +++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue @@ -1,41 +1,39 @@ - @@ -72,8 +76,8 @@ export default { input[type="radio"], input[type="checkbox"] { opacity: 0; - position: fixed; width: 0; + height: 0; &:focus-visible + label { box-shadow: 0 0 0 2px $blue; } @@ -102,11 +106,15 @@ export default { + p { display: none; } - &.first-item { + } + &:first-of-type { + label { border-bottom-left-radius: 0.5rem; border-top-left-radius: 0.5rem; } - &.last-item { + } + &:last-of-type { + label { border-bottom-right-radius: 0.5rem; border-top-right-radius: 0.5rem; } diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue index d82486f23..912403025 100644 --- a/src/ux-components/list-button/list-button.vue +++ b/src/ux-components/list-button/list-button.vue @@ -1,40 +1,38 @@ + + diff --git a/src/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js index 8438e01b9..3bb6af61c 100644 --- a/src/ux-components/list-card/list-card.spec.js +++ b/src/ux-components/list-card/list-card.spec.js @@ -22,65 +22,6 @@ describe("list-card.vue", () => { expect(input.attributes().type).toEqual("checkbox"); }); - it("Should return input type radio if isRadio is true", async () => { - // Act - const wrapper = shallowMount(listCard, { - propsData: { - isRadio: true, - buttonLabel: "Windshield", - buttonID: "List Card Checkbox", - groupID: "radio-demo-1", - groupName: "radio 1", - buttonImage: "windshield-damage.svg", - }, - }); - - // Assert - const input = wrapper.find("input"); - - expect(input.attributes().type).toEqual("radio"); - }); - - it("Should return input type checkbox if isMultiSelectHorizontal is true", async () => { - // Act - const wrapper = shallowMount(listCard, { - propsData: { - isMultiSelectHorizontal: true, - buttonLabel: "Windshield", - buttonID: "List Card Checkbox", - groupID: "radio-demo-1", - groupName: "radio 1", - buttonImage: "windshield-damage.svg" - }, - }); - - // Assert - const input = wrapper.find("input"); - - expect(input.attributes().type).toEqual("checkbox"); - - }); - - it("Should return input type radio if isRadioHorizontal is true", async () => { - // Act - const wrapper = shallowMount(listCard, { - propsData: { - isRadioHorizontal: true, - buttonLabel: "Windshield", - buttonID: "List Card Checkbox", - groupID: "radio-demo-1", - groupName: "radio 1", - buttonImage: "windshield-damage.svg" - }, - }); - - // Assert - const input = wrapper.find("input"); - - expect(input.attributes().type).toEqual("radio"); - - }); - it("Should return primary label text", async () => { // Act const wrapper = shallowMount(listCard, { diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue index 1bd0739ba..c038eef75 100644 --- a/src/ux-components/list-card/list-card.vue +++ b/src/ux-components/list-card/list-card.vue @@ -1,61 +1,63 @@ @@ -77,8 +79,8 @@ export default { input[type='checkbox'], input[type="radio"] { opacity: 0; - position: fixed; width: 0; + height: 0; + label { display: block; position: relative; diff --git a/vue.config.js b/vue.config.js index 9d9b2401b..316656ed1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,17 +8,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"; `, }, }, 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"; `, }, },