From e5c0689eeab4cfbee02e7e9f95e0764a3daa18f9 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 10:47:59 -0500
Subject: [PATCH 1/7] CSR-1023 update Concept code with code from ISS.

Tested site flow locally without issues.
---
 .../base-input-button/button-functionality-props.js      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
index 9a4aef5c9..748abaeb7 100644
--- a/src/digital-components/base-input-button/button-functionality-props.js
+++ b/src/digital-components/base-input-button/button-functionality-props.js
@@ -4,8 +4,15 @@ export const inputButtonProps = {
         required: true,
     },
     modelValue: {
-        type: [Array, String, Number],
         required: true,
+        validator: function(prop) {
+            return (
+                prop === null
+                || Array.isArray(prop)
+                || typeof prop === 'string'
+                || (typeof prop === 'number' && !Number.isNaN(prop))
+            )
+        }
     },
     isMultiSelect: Boolean,
     groupName: {

From ac3b30a2a47a293c6649c7acc0623668ecf7a95a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 10:50:40 -0500
Subject: [PATCH 2/7] Code format.

---
 .../button-functionality-props.js                  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
index 748abaeb7..fe2104457 100644
--- a/src/digital-components/base-input-button/button-functionality-props.js
+++ b/src/digital-components/base-input-button/button-functionality-props.js
@@ -5,14 +5,14 @@ export const inputButtonProps = {
     },
     modelValue: {
         required: true,
-        validator: function(prop) {
+        validator: function (prop) {
             return (
-                prop === null
-                || Array.isArray(prop)
-                || typeof prop === 'string'
-                || (typeof prop === 'number' && !Number.isNaN(prop))
-            )
-        }
+                prop === null ||
+                Array.isArray(prop) ||
+                typeof prop === "string" ||
+                (typeof prop === "number" && !Number.isNaN(prop))
+            );
+        },
     },
     isMultiSelect: Boolean,
     groupName: {

From b24f1fb95d6548bf3d56cc57cde82dfe37cf5bf5 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 15:26:20 -0500
Subject: [PATCH 3/7] CSR-1021 Move ux-components folder to src

---
 .../button-question/button-question.vue                   | 8 ++++----
 src/digital-components/modal/modal.vue                    | 2 +-
 src/fmg-components/funnel-footer/funnel-footer.vue        | 4 ++--
 src/fmg-components/funnel-header/funnel-header.vue        | 2 +-
 .../funnel-header/menu-modal/menu-modal.vue               | 2 +-
 .../questions-page-layout/questions-page-layout.vue       | 2 +-
 src/layouts/address-lookup/address-lookup.vue             | 2 +-
 .../address-questions/address-questions.spec.js           | 2 +-
 .../address-questions/address-questions.vue               | 2 +-
 .../address-vehicles-question.vue                         | 2 +-
 src/layouts/address-vehicles/address-vehicles.vue         | 2 +-
 src/layouts/estimate/estimate.vue                         | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue | 2 +-
 .../service-package-radio/service-package-radio.vue       | 2 +-
 src/layouts/vehicle-damage/vehicle-damage.vue             | 2 +-
 .../windshield-options/windshield-options.vue             | 2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue               | 2 +-
 .../vin-lookup/vin-information/vin-information.vue        | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                     | 2 +-
 src/mixins/input-button-wrapper-mixin.spec.js             | 8 ++++----
 .../ux-components/alert/alert.spec.js                     | 0
 src/{fmg-components => }/ux-components/alert/alert.vue    | 0
 .../ux-components/button-main/button-main.spec.js         | 0
 .../ux-components/button-main/button-main.vue             | 2 +-
 .../ux-components/checkbox/checkbox.spec.js               | 0
 .../ux-components/checkbox/checkbox.vue                   | 0
 .../list-button-horizontal/list-button-horizontal.spec.js | 0
 .../list-button-horizontal/list-button-horizontal.vue     | 0
 .../ux-components/list-button/list-button.spec.js         | 0
 .../ux-components/list-button/list-button.vue             | 2 +-
 .../ux-components/list-card/list-card.spec.js             | 0
 .../ux-components/list-card/list-card.vue                 | 0
 .../ux-components/loader/loader.spec.js                   | 0
 src/{fmg-components => }/ux-components/loader/loader.vue  | 0
 .../ux-components/radio/radio.spec.js                     | 0
 src/{fmg-components => }/ux-components/radio/radio.vue    | 0
 .../ux-components/text-link/text-link.spec.js             | 0
 .../ux-components/text-link/text-link.vue                 | 0
 38 files changed, 29 insertions(+), 29 deletions(-)
 rename src/{fmg-components => }/ux-components/alert/alert.spec.js (100%)
 rename src/{fmg-components => }/ux-components/alert/alert.vue (100%)
 rename src/{fmg-components => }/ux-components/button-main/button-main.spec.js (100%)
 rename src/{fmg-components => }/ux-components/button-main/button-main.vue (98%)
 rename src/{fmg-components => }/ux-components/checkbox/checkbox.spec.js (100%)
 rename src/{fmg-components => }/ux-components/checkbox/checkbox.vue (100%)
 rename src/{fmg-components => }/ux-components/list-button-horizontal/list-button-horizontal.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-button-horizontal/list-button-horizontal.vue (100%)
 rename src/{fmg-components => }/ux-components/list-button/list-button.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-button/list-button.vue (97%)
 rename src/{fmg-components => }/ux-components/list-card/list-card.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-card/list-card.vue (100%)
 rename src/{fmg-components => }/ux-components/loader/loader.spec.js (100%)
 rename src/{fmg-components => }/ux-components/loader/loader.vue (100%)
 rename src/{fmg-components => }/ux-components/radio/radio.spec.js (100%)
 rename src/{fmg-components => }/ux-components/radio/radio.vue (100%)
 rename src/{fmg-components => }/ux-components/text-link/text-link.spec.js (100%)
 rename src/{fmg-components => }/ux-components/text-link/text-link.vue (100%)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 661e3ace1..646b244be 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -74,10 +74,10 @@
 </template>
 
 <script>
-import listButton from "@/fmg-components/ux-components/list-button/list-button";
-import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
-import listCard from "@/fmg-components/ux-components/list-card/list-card";
-import radio from "@/fmg-components/ux-components/radio/radio";
+import listButton from "@/ux-components/list-button/list-button";
+import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
+import listCard from "@/ux-components/list-card/list-card";
+import radio from "@/ux-components/radio/radio";
 import { ErrorMessage } from "vee-validate";
 
 export default {
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 71f026020..7de269644 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
+import buttonMain from "@/ux-components/button-main/button-main";
 
 export default {
     name: "modal",
diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index b5cf16002..2a6119681 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
-import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
+import textLink from "@/ux-components/text-link/text-link";
+import buttonMain from "@/ux-components/button-main/button-main";
 
 export default {
     name: "funnelFooter",
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 593989e6e..acfacd709 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
 import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index 3b9bbf26c..fd0c96cb8 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 export default {
     name: "menuModal",
     data() {
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index 8d78fee3f..f6bb2a656 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -37,7 +37,7 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import questionChain from "@/digital-components/question-chain/question-chain";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 4599a017b..9e27bbac7 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -86,7 +86,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 import { Form, defineRule } from "vee-validate";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 0ab14d352..c8d24c57e 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -1,6 +1,6 @@
 // Components
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting Files
 import { mount, shallowMount } from "@vue/test-utils";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 60d6512cf..ba45ea133 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -73,7 +73,7 @@
 <script>
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 4afb07c52..0eb7db6ba 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -22,7 +22,7 @@
 
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting files
 import { getDamageString } from "@/helpers/damage-helper";
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index da59d2e5b..92b775b3b 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -50,7 +50,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
 
 // Supporting files
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index df9adcf17..f09896838 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -89,7 +89,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import textBlock from "@/digital-components/text-block/text-block";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index ee2573fa3..5b7c0b568 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -95,7 +95,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import textBlock from "@/digital-components/text-block/text-block";
 
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index 3828801cc..e50f18820 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -52,7 +52,7 @@
 
 <script>
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 import {
     getLinkDisplayTextFromCopy,
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 39c6845c2..f2fc72b38 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -67,7 +67,7 @@ import sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-doo
 import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
 import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 44250f860..b878e5380 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -42,7 +42,7 @@
 import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question";
 import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b4036ffa1..5723cd0a8 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -49,7 +49,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index dd1d068e0..9571cb5eb 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 //Supporting files
 import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 849f19b74..6db8736c3 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -114,7 +114,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
 import textBlock from "@/digital-components/text-block/text-block";
diff --git a/src/mixins/input-button-wrapper-mixin.spec.js b/src/mixins/input-button-wrapper-mixin.spec.js
index 63595fb62..1a3c1bb03 100644
--- a/src/mixins/input-button-wrapper-mixin.spec.js
+++ b/src/mixins/input-button-wrapper-mixin.spec.js
@@ -1,10 +1,10 @@
 import { mount } from "@vue/test-utils";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
-import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
-import listButton from "@/fmg-components/ux-components/list-button/list-button";
-import listCard from "@/fmg-components/ux-components/list-card/list-card";
-import radio from "@/fmg-components/ux-components/radio/radio";
+import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
+import listButton from "@/ux-components/list-button/list-button";
+import listCard from "@/ux-components/list-card/list-card";
+import radio from "@/ux-components/radio/radio";
 
 describe("input-button-wrapper-mixin", () => {
     describe("mouse clicks", () => {
diff --git a/src/fmg-components/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/alert/alert.spec.js
rename to src/ux-components/alert/alert.spec.js
diff --git a/src/fmg-components/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
similarity index 100%
rename from src/fmg-components/ux-components/alert/alert.vue
rename to src/ux-components/alert/alert.vue
diff --git a/src/fmg-components/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/button-main/button-main.spec.js
rename to src/ux-components/button-main/button-main.spec.js
diff --git a/src/fmg-components/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
similarity index 98%
rename from src/fmg-components/ux-components/button-main/button-main.vue
rename to src/ux-components/button-main/button-main.vue
index 26be0f184..18d7427c2 100644
--- a/src/fmg-components/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import loader from "@/fmg-components/ux-components/loader/loader";
+import loader from "@/ux-components/loader/loader";
 
 export default {
     name: "buttonMain",
diff --git a/src/fmg-components/ux-components/checkbox/checkbox.spec.js b/src/ux-components/checkbox/checkbox.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/checkbox/checkbox.spec.js
rename to src/ux-components/checkbox/checkbox.spec.js
diff --git a/src/fmg-components/ux-components/checkbox/checkbox.vue b/src/ux-components/checkbox/checkbox.vue
similarity index 100%
rename from src/fmg-components/ux-components/checkbox/checkbox.vue
rename to src/ux-components/checkbox/checkbox.vue
diff --git a/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
rename to src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
diff --git a/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
similarity index 100%
rename from src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
rename to src/ux-components/list-button-horizontal/list-button-horizontal.vue
diff --git a/src/fmg-components/ux-components/list-button/list-button.spec.js b/src/ux-components/list-button/list-button.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-button/list-button.spec.js
rename to src/ux-components/list-button/list-button.spec.js
diff --git a/src/fmg-components/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
similarity index 97%
rename from src/fmg-components/ux-components/list-button/list-button.vue
rename to src/ux-components/list-button/list-button.vue
index 0e2383c07..1ebc46cc7 100644
--- a/src/fmg-components/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import loader from "@/fmg-components/ux-components/loader/loader";
+import loader from "@/ux-components/loader/loader";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
diff --git a/src/fmg-components/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-card/list-card.spec.js
rename to src/ux-components/list-card/list-card.spec.js
diff --git a/src/fmg-components/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
similarity index 100%
rename from src/fmg-components/ux-components/list-card/list-card.vue
rename to src/ux-components/list-card/list-card.vue
diff --git a/src/fmg-components/ux-components/loader/loader.spec.js b/src/ux-components/loader/loader.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/loader/loader.spec.js
rename to src/ux-components/loader/loader.spec.js
diff --git a/src/fmg-components/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
similarity index 100%
rename from src/fmg-components/ux-components/loader/loader.vue
rename to src/ux-components/loader/loader.vue
diff --git a/src/fmg-components/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/radio/radio.spec.js
rename to src/ux-components/radio/radio.spec.js
diff --git a/src/fmg-components/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
similarity index 100%
rename from src/fmg-components/ux-components/radio/radio.vue
rename to src/ux-components/radio/radio.vue
diff --git a/src/fmg-components/ux-components/text-link/text-link.spec.js b/src/ux-components/text-link/text-link.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/text-link/text-link.spec.js
rename to src/ux-components/text-link/text-link.spec.js
diff --git a/src/fmg-components/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
similarity index 100%
rename from src/fmg-components/ux-components/text-link/text-link.vue
rename to src/ux-components/text-link/text-link.vue

From 28527e2653ff5dca25e9d4796c5632f5d5c9af98 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 15:27:16 -0500
Subject: [PATCH 4/7] Update path to loader.

---
 src/ux-components/loader/loader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
index 8698c27fc..daea9c511 100644
--- a/src/ux-components/loader/loader.vue
+++ b/src/ux-components/loader/loader.vue
@@ -42,7 +42,7 @@ export default {
     //Spinner basics
     &:after {
         content: "";
-        mask: url(../../../assets/img/icons/spinner.svg);
+        mask: url(../../assets/img/icons/spinner.svg);
         mask-size: cover;
         position: relative;
         width: 1rem;

From 4ae65542c1f9f20fb3ba2135fa7eab814833fec5 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 10:23:42 -0500
Subject: [PATCH 5/7] CSR-1097 fix error spacing and line height.

---
 src/digital-components/button-question/button-question.vue   | 2 +-
 src/digital-components/textbox-question/textbox-question.vue | 4 ++--
 src/styles/common-typography-styles.scss                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 646b244be..a7b37ef5e 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -68,7 +68,7 @@
             </fieldset>
         </div>
         <div class="row form-test-error mt-1">
-            <error-message :name="formatString(groupName)" v-if="!suppressError"></error-message>
+            <error-message class="small" :name="formatString(groupName)" v-if="!suppressError"></error-message>
         </div>
     </div>
 </template>
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 957f59f36..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -32,8 +32,8 @@
                 @focus="$emit('focus', $event.target.value)" />
             <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
         </div>
-        <div v-show="errorMessage" class="row my-2 form-test-error">
-            <span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span>
+        <div v-show="errorMessage" class="row my-1 form-test-error">
+            <span class="d-inline-flex small mt-0" role="alert">{{ errorMessage }}</span>
         </div>
     </div>
 </template>
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 72b2e5875..a1b2a5e2b 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7;
+    line-height: 1.7142857143;
     font-weight: 400;
 }
 

From bbfe4f190de064b608c89cf90d41d7303c5f3808 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 10:59:58 -0500
Subject: [PATCH 6/7] Format code.

---
 src/digital-components/button-question/button-question.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index a7b37ef5e..bf167b5ef 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -68,7 +68,10 @@
             </fieldset>
         </div>
         <div class="row form-test-error mt-1">
-            <error-message class="small" :name="formatString(groupName)" v-if="!suppressError"></error-message>
+            <error-message
+                class="small"
+                :name="formatString(groupName)"
+                v-if="!suppressError"></error-message>
         </div>
     </div>
 </template>

From 807b0a6bcc99723bfbca4f0147d4b8e518f24460 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 13:39:12 -0500
Subject: [PATCH 7/7] Minor change to force build.

---
 src/digital-components/button-question/button-question.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index bf167b5ef..4c60b0708 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -1,4 +1,5 @@
-<!-- Documented in confluence https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
+<!-- Documented in confluence
+https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
 <template>
     <div
         :class="