From 3b97b21c2408b3e5a85a22c690153bed473195a1 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Fri, 28 Apr 2023 19:20:56 +0530
Subject: [PATCH 1/8] SSR-411

Removed the sticky footer and fixed the space between the button
---
 .../button-question/button-question.vue            |  2 +-
 src/iss-components/site-footer/site-footer.vue     |  9 +++++----
 .../coverage-statement/coverage-statement.vue      |  6 +++++-
 .../license-plate-lookup/license-plate-lookup.vue  |  2 +-
 .../policy-holder-details.vue                      |  2 +-
 src/layouts/service-location/service-location.vue  |  4 +---
 src/layouts/service-packages/service-packages.vue  | 14 ++++++++++----
 .../vin-location-information.vue                   |  2 +-
 src/layouts/welcome-page/welcome-page.vue          | 12 +++++++-----
 src/styles/common-styles.scss                      |  2 +-
 src/styles/common-typography-styles.scss           |  1 +
 11 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index d36cac83..6cae736c 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -9,7 +9,7 @@
             <span class="fw-bold w-100">{{ questionText }}</span>
         </div>
 
-        <div class="w-100 d-flex justify-content-center">
+        <div class="w-100 d-flex justify-content-center mb-2">
             <fieldset
                 class="w-100"
                 :aria-required="isRequired"
diff --git a/src/iss-components/site-footer/site-footer.vue b/src/iss-components/site-footer/site-footer.vue
index 2ce2c41c..5cd5c09d 100644
--- a/src/iss-components/site-footer/site-footer.vue
+++ b/src/iss-components/site-footer/site-footer.vue
@@ -1,8 +1,6 @@
 <template>
-    <div class="footerImage" id="imgCity" v-if="footerImageURL" >
-        <img id="siteFooterImage" :src="footerImageURL" />
-    </div>
-    <footer class="footer container-fluid fixed-bottom g-5 bg-light py-4" id="infoBox">
+    
+    <footer class="footer container-fluid  g-5  py-4" id="infoBox">
         <div class="row d-flex flex-row-reverse align-items-center vw-100 mx-0">
             <div class="col button-col d-flex" id="stacked" >
                 <buttonMain
@@ -31,6 +29,9 @@
             </div>
         </div>
     </footer>
+    <div class="footerImage" id="imgCity" v-if="footerImageURL" >
+        <img id="siteFooterImage" :src="footerImageURL" />
+    </div>
 </template>
 
 <script>
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index d6aa5d42..0758f782 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -156,6 +156,7 @@ export default {
 <style lang="scss">
 ol {
   margin-left: -1rem;
+  margin-bottom:0;
   li {
       margin-bottom: .5rem;
       line-height: 1.5rem;
@@ -169,7 +170,10 @@ ol {
   color: $black;
 }
 p strong {
-  color: $black;
+  color: $black;  
   font-weight: 500;
 }
+p.small{
+    margin-bottom:0;
+}
 </style>
\ No newline at end of file
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index b1c49299..53ac3969 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -51,7 +51,7 @@
                                     :options="stateOptions"
                                     disableAutoFill
                                     validationRules="state-required"
-                                    class="mt-4" />
+                                    class="mt-4 mb-2"/>
                                     <siteFooter
                                     :isForwardActionDisabled="!meta.valid"
                                     cms-widget-name="SiteFooterWidget"
diff --git a/src/layouts/policy-holder-details/policy-holder-details.vue b/src/layouts/policy-holder-details/policy-holder-details.vue
index 1de675b1..c05d6073 100644
--- a/src/layouts/policy-holder-details/policy-holder-details.vue
+++ b/src/layouts/policy-holder-details/policy-holder-details.vue
@@ -4,7 +4,7 @@
             <div class="fade-on-route-transition position-relative">
                 <siteHeader cmsWidgetName="SiteHeaderWidget"/>
                 <div class="container-fluid pb-2">
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4 px-3 mb-2">
                         <div class="col">
                             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" id="sub-header"/>
                             <addressQuestions ref="addressQuestions" v-model="customerQuestions.addressQuestions" includeStreetAddress2="true" id="address-questions-wrapper"/>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index b40a01d9..415a63bb 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -219,9 +219,7 @@ export default {
 </script>
 
 <style lang="scss">
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
+
 .page-container-grouped-styles {
     overflow: auto;
 }
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 14adb371..a22937d6 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -6,7 +6,7 @@
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"
                            justification="left"
                            issContainingPage="service-packages"/>
-            <div class="fade-on-route-transition sub-container make-tall">
+            <div class="fade-on-route-transition ">
                 <servicePackageQuestion ref="servicePackage"
                                         cmsWidgetName="ServicePackage"
                                         groupName="ServicePackageQuestion"
@@ -18,8 +18,8 @@
                 <textBlock cmsWidgetName="PriceDisclaimerWidget"
                            justifyText="left"
                            typeStyle="caption"
-                           style="margin-bottom: 6rem;"
-                           class="mt-2 mx-6" />
+                           
+                           class="mt-2 mx-6 mb-2" />
                 <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
                 <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
                 <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />
@@ -188,4 +188,10 @@
             contentGroupModal
         }
     };
-</script>
\ No newline at end of file
+</script>
+<style>
+.fade-on-route-transition{
+overflow-x:hidden;
+} 
+
+</style>
\ No newline at end of file
diff --git a/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue b/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
index 93d78c50..3ca346db 100644
--- a/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
+++ b/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="vin-location-information mt-2">
+  <div class="vin-location-information mt-2 mb-2">
     <div
       class="vin-toggle"
       :class="[isVinLocationDetailVisible ? 'active' : '']"
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 3757e2e4..0869c1e1 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -88,9 +88,10 @@
                             disableAutoFill />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row px-3" >
                         <div class="col">
                             <textboxQuestion
+                            class="mt-4"
                             inputId="damageCityField"
                             cmsWidgetName="DamageCityQuestion"
                             v-model="welcomePageModel.damageCity"
@@ -101,9 +102,10 @@
                             validationRules="loss-city-required" />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row px-3">
                         <div class="col">
                             <dropdownQuestion
+                            class="mt-4"
                             cmsWidgetName="DamageStateQuestion"
                             v-model="welcomePageModel.damageState"
                             ref="state"
@@ -118,9 +120,9 @@
                             />
                         </div>
                     </div>
-                    <div class="row mt-4">
+                    <div class="row mb-2 ">
                         <buttonQuestion
-                        class="px-0"
+                        class="px-0 mt-4"
                         cmsWidgetName="GlassOnlyQuestion"
                         v-model="welcomePageModel.isDamageGlassOnly"
                         inputId = "isDamageGlassOnly"
@@ -134,7 +136,7 @@
                         v-if="this.displayGlassOnlyQuestion"
                         disableAutoFill/>
                     </div>
-                    <div class="row mt-4 position-sticky top-100" id="welcomeFooter">
+                    <div class="row position-sticky top-100" id="welcomeFooter">
                         <div class="col">
                             <site-footer
                             cmsWidgetName="SiteFooterWidget"
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 73e01e30..409e79a5 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -54,7 +54,7 @@ body {
     }
     // Scroll page when modal isn't open
     .fade-on-route-transition {
-        height: calc(100% - 80px);
+        height: calc(100% - 10px);
         overflow: auto;
     }
     // Prevent scroll when modal is open
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index a593092e..25ced103 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -4,6 +4,7 @@ body {
   font-size: 1rem;
   line-height: 1.625;
   font-weight: 400;
+  overflow:hidden;
 }
 
 //Headings

From 513be29045d9d40d836ee97a3595785f51b70496 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Tue, 2 May 2023 16:35:19 +0530
Subject: [PATCH 2/8] SSR-411

Updated
---
 src/digital-components/button-question/button-question.vue | 2 +-
 src/layouts/service-location/service-location.vue          | 2 +-
 src/layouts/vehicle-damage/vehicle-damage.vue              | 5 +++--
 src/styles/common-typography-styles.scss                   | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 6cae736c..d36cac83 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -9,7 +9,7 @@
             <span class="fw-bold w-100">{{ questionText }}</span>
         </div>
 
-        <div class="w-100 d-flex justify-content-center mb-2">
+        <div class="w-100 d-flex justify-content-center">
             <fieldset
                 class="w-100"
                 :aria-required="isRequired"
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 415a63bb..cb04f68a 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -29,7 +29,7 @@
                                         isRequired
                                         v-model="selectedAppointmentType"
                                         validationRules="selection-required"
-                                        class="service-location-button-question"/>
+                                        class="service-location-button-question mb-1"/>
                                     <div class="select-car">
                                         <div class="container-fluid pb-2">
                                             <div class="row px-3">
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index daf6b9a1..a76dffd9 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -28,7 +28,8 @@
                             v-model="selectedWindshieldOptions"
                             :hasRepairReplaceConflict="hasRepairReplaceConflict"
                             :hasSplitSingleConflict="hasSplitSingleConflict"
-                            :selectedDamageLocations="selectedDamageLocations" />
+                            :selectedDamageLocations="selectedDamageLocations"
+                            class="mb-1" />
                             <alert
                             v-if="hasRepairReplaceConflict"
                             class="my-5"
@@ -41,7 +42,7 @@
                             groupName="SideDoorSideQuestion"
                             v-model="sideDoorOptionsData"
                             v-show="!hasRepairReplaceConflict"
-                            :selectedDamageLocations="selectedDamageLocations" />
+                            :selectedDamageLocations="selectedDamageLocations"  class="mb-1"/>
                             <replaceOptionsQuestion
                             ref="backGlassOptions"
                             cmsWidgetName="RearReplaceOptionsQuestion"
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 25ced103..a593092e 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -4,7 +4,6 @@ body {
   font-size: 1rem;
   line-height: 1.625;
   font-weight: 400;
-  overflow:hidden;
 }
 
 //Headings

From 67216a7a6fd8e6497901b27dcddc359034503439 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Wed, 3 May 2023 16:21:40 +0530
Subject: [PATCH 3/8] SSR-411

Updated alignment for the button
---
 .../site-footer/site-footer.vue               |  6 +++---
 .../coverage-statement/coverage-statement.vue |  7 ++++---
 .../policy-holder-details.vue                 |  4 ++--
 .../provider-preference.vue                   |  2 +-
 .../service-location/service-location.vue     |  6 +++---
 src/layouts/vehicle-damage/vehicle-damage.vue |  2 +-
 src/layouts/vehicle-make/vehicle-make.vue     |  4 ++--
 src/layouts/vehicle-model/vehicle-model.vue   |  4 ++--
 src/layouts/vehicle-style/vehicle-style.vue   |  4 ++--
 src/layouts/vehicle-year/vehicle-year.vue     |  4 ++--
 .../vin-location-information.vue              |  2 +-
 src/layouts/welcome-page/welcome-page.vue     | 20 +++++++++----------
 12 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/iss-components/site-footer/site-footer.vue b/src/iss-components/site-footer/site-footer.vue
index 5cd5c09d..6d11a345 100644
--- a/src/iss-components/site-footer/site-footer.vue
+++ b/src/iss-components/site-footer/site-footer.vue
@@ -1,8 +1,8 @@
 <template>
     
-    <footer class="footer container-fluid  g-5  py-4" id="infoBox">
+    <footer class="footer container-fluid  g-5 px-0  py-3 " id="infoBox">
         <div class="row d-flex flex-row-reverse align-items-center vw-100 mx-0">
-            <div class="col button-col d-flex" id="stacked" >
+            <div class="col button-col d-flex px-0" id="stacked" >
                 <buttonMain
                     v-if="!isForwardButtonHidden"
                     ref="buttonMain"
@@ -17,7 +17,7 @@
                     data-bs-dismiss="modal"
                     data-test-id="site-footer-main-button" />
             </div>
-            <div v-if="!isBackButtonHidden" class="col-auto link-col py-1 text-break">
+            <div v-if="!isBackButtonHidden" class="col-auto link-col py-1 px-0 text-break">
                 <textLink
                     linkType="navigation"
                     :text="backLink"
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 693cec35..20f86f32 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -7,7 +7,7 @@
                   <div class="container-fluid pb-2">
                       <div class="row px-3">
                           <div class="col">
-                              <div class="select-car-form rounded">
+                              <div class="select-car-form rounded pb-1">
                                   <textBlock
                                   cmsWidgetName="verifyingCoverageStatement"
                                   typeStyle="h5"
@@ -28,14 +28,15 @@
                                   </div>
                                   
                                   <steeringText  cmsWidgetName="MASteeringText" ></steeringText>
-                                  <siteFooter
+                                 
+                              </div>
+                              <siteFooter
                                   cmsWidgetName="SiteFooterWidget"
                                   :isForwardActionDisabled="!meta.valid"
                                   @backClicked="navigateBack"
                                   @forwardClicked="forwardButtonAction"
                                   ref="siteFooter"
                                   />
-                              </div>
                           </div>
                       </div>
                   </div>
diff --git a/src/layouts/policy-holder-details/policy-holder-details.vue b/src/layouts/policy-holder-details/policy-holder-details.vue
index 078f4c86..5ad26018 100644
--- a/src/layouts/policy-holder-details/policy-holder-details.vue
+++ b/src/layouts/policy-holder-details/policy-holder-details.vue
@@ -3,8 +3,8 @@
         <div class="page-container-grouped-styles">
             <div class="fade-on-route-transition position-relative">
                 <siteHeader cmsWidgetName="SiteHeaderWidget"/>
-                <div class="container-fluid pb-2">
-                    <div class="row mt-4 px-3 mb-2">
+                <div class="container-fluid pb-2 px-5">
+                    <div class="row mt-4 mb-3">
                         <div class="col">
                             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" id="sub-header"/>
                             <addressQuestions ref="addressQuestions" v-model="customerQuestions.addressQuestions" includeStreetAddress2="true" id="address-questions-wrapper"/>
diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue
index eb049925..5c049255 100644
--- a/src/layouts/provider-preference/provider-preference.vue
+++ b/src/layouts/provider-preference/provider-preference.vue
@@ -4,7 +4,7 @@
           ref="theForm"  
           v-slot="{ meta }" >
         <div class="page-container-grouped-styles">
-            <div class="fade-on-route-transition position-relative">
+            <div class="fade-on-route-transition position-relative px-5">
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
                 <siteSubHeader cmsWidgetName="SiteSubHeader" id="sub-header" class="mt-4"/>
                 <button v-on:click="forwardButtonAction">Temp Forward Button</button>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index cb04f68a..975c6918 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -30,9 +30,9 @@
                                         v-model="selectedAppointmentType"
                                         validationRules="selection-required"
                                         class="service-location-button-question mb-1"/>
-                                    <div class="select-car">
-                                        <div class="container-fluid pb-2">
-                                            <div class="row px-3">
+                                    <div class="select-car pt-1">
+                                        <div class="container-fluid px-0 pb-2">
+                                            <div class="row">
                                                 <div class="col">
                                                     <div class="select-car-form rounded">
                                                         <siteFooter
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 0f3b336f..f01ff4a4 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -29,7 +29,7 @@
                             :hasRepairReplaceConflict="hasRepairReplaceConflict"
                             :hasSplitSingleConflict="hasSplitSingleConflict"
                             :selectedDamageLocations="selectedDamageLocations"
-                            class="mb-1" />
+                            class="mb-3" />
                             <alert
                             v-if="hasRepairReplaceConflict"
                             class="my-5"
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 2c48f36a..c76151cc 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -3,13 +3,13 @@
         <div class="fade-on-route-transition position-relative">
             <siteHeader cmsWidgetName="SiteHeaderWidget" />
             <div class="select-car">
-                <div class="container-fluid pb-2">
+                <div class="container-fluid pb-2 px-5">
                     <div class="row">
                         <div class="col">
                             <div class="select-car-form rounded text-center">
                                 <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="true" class="mb-3" />
                                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" :hasBackButton="true" @click-event="backButtonAction" />
-                                <makeQuestion class="px-4" v-model="selectedMake" ref="makeQuestion" cmsWidgetName="VehicleMakeQuestion" />
+                                <makeQuestion v-model="selectedMake" ref="makeQuestion" cmsWidgetName="VehicleMakeQuestion" />
                                 <siteFooter cmsWidgetName="SiteFooterWidget" ref="siteFooter" @back-clicked="backButtonAction" :isForwardButtonHidden="shouldHideForwardButton" />
                             </div>
                         </div>
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index 4fba014f..ca9f8c8c 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -3,13 +3,13 @@
         <div class="fade-on-route-transition position-relative">
             <siteHeader cmsWidgetName="SiteHeaderWidget" />
             <div class="select-car">
-                <div class="container-fluid pb-2">
+                <div class="container-fluid pb-2 px-5">
                     <div class="row">
                         <div class="col">
                             <div class="select-car-form rounded text-center">
                                 <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="true" class="mb-3" />
                                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" :hasBackButton="true" :backButtonAccessibleText="backButtonAccessibleText" @click-event="backButtonAction" />
-                                <modelQuestion v-model="selectedModel" ref="modelQuestion" cmsWidgetName="VehicleModelQuestion" class="px-4" />
+                                <modelQuestion v-model="selectedModel" ref="modelQuestion" cmsWidgetName="VehicleModelQuestion"  />
                                 <siteFooter cmsWidgetName="SiteFooterWidget" ref="siteFooter" @back-clicked="backButtonAction" :isForwardButtonHidden="shouldHideForwardButton" />
                             </div>
                         </div>
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index fa10e553..3a85adea 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -3,13 +3,13 @@
         <div class="fade-on-route-transition position-relative">
             <siteHeader cmsWidgetName="SiteHeaderWidget" />
             <div class="select-car">
-                <div class="container-fluid pb-2">
+                <div class="container-fluid pb-2 px-5">
                     <div class="row">
                         <div class="col">
                             <div class="select-car-form rounded text-center">
                                 <vehicleBanner cmsWidgetName="VehicleBannerWidget" class="mb-3" displayGenericVehicleImage />
                                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" :hasBackButton="true" :backButtonAccessibleText="backButtonAccessibleText" @click-event="backButtonAction" />
-                                <styleQuestion v-model="selectedStyle" ref="styleQuestion" cmsWidgetName="VehicleStyleQuestion" class="px-4" />
+                                <styleQuestion v-model="selectedStyle" ref="styleQuestion" cmsWidgetName="VehicleStyleQuestion" />
                                 <siteFooter cmsWidgetName="SiteFooterWidget" ref="siteFooter" @back-clicked="backButtonAction" :isForwardButtonHidden="shouldHideForwardButton" />
                             </div>
                         </div>
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index fe9b41fa..4fd9c626 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -3,13 +3,13 @@
         <div class="fade-on-route-transition position-relative">
             <siteHeader cmsWidgetName="SiteHeaderWidget" />
             <div class="select-car">
-                <div class="container-fluid pb-2">
+                <div class="container-fluid pb-2 px-5">
                     <div class="row">
                         <div class="col">
                             <div class="select-car-form rounded text-center">
                                 <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="true" class="mb-3" />
                                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" />
-                                <yearQuestion class="px-4" v-model="selectedYear" ref="yearQuestion" cmsWidgetName="VehicleYearQuestion" />
+                                <yearQuestion  v-model="selectedYear" ref="yearQuestion" cmsWidgetName="VehicleYearQuestion" />
                                 <siteFooter cmsWidgetName="SiteFooterWidget" ref="siteFooter" @back-clicked="backButtonAction" :isForwardButtonHidden="shouldHideForwardButton" />
                             </div>
                         </div>
diff --git a/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue b/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
index 3ca346db..bec9bcdc 100644
--- a/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
+++ b/src/layouts/vin-lookup/vin-location-information/vin-location-information.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="vin-location-information mt-2 mb-2">
+  <div class="vin-location-information mt-2 mb-3">
     <div
       class="vin-toggle"
       :class="[isVinLocationDetailVisible ? 'active' : '']"
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index d9c5c86a..4979b279 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -3,9 +3,9 @@
         <div class="page-container-grouped-styles welcome">
             <div class="fade-on-route-transition position-relative">
                 <siteHeader cmsWidgetName="SiteHeaderWidget"/>
-                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" class="mt-4"/>
-                <div class="container-fluid pb-2">
-                    <div class="row mt-5 px-3">
+                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"/>
+                <div class="container-fluid px-5">
+                    <div class="row mt-4">
                         <div class="col">
                             <textboxQuestion
                             inputId="policyNumberField"
@@ -18,7 +18,7 @@
                             validationRules="policy-number-required" />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3" v-if="this.displayPolicyZip">
+                    <div class="row mt-4 " v-if="this.displayPolicyZip">
                         <div class="col">
                             <textboxQuestion
                             inputId="policyZipCode"
@@ -27,7 +27,7 @@
                             ref="policyZip" />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4">
                         <div class="col">
                             <textboxQuestion
                             type="date"
@@ -48,7 +48,7 @@
                             <textBlock cmsWidgetName="DamageDateEstimateWidget" typeStyle="small" class="mt-2" />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4">
                         <div class="col">
                             <dropdownQuestion
                             cmsWidgetName="DamageCauseQuestion"
@@ -63,7 +63,7 @@
                             />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4 ">
                         <div class="col">
                             <textboxQuestion
                             inputId="phoneNumberField"
@@ -76,7 +76,7 @@
                             disableAutoFill />
                         </div>
                     </div>
-                    <div class="row mt-4 px-3">
+                    <div class="row mt-4">
                         <div class="col">
                             <textboxQuestion
                             inputId="emailField"
@@ -88,7 +88,7 @@
                             disableAutoFill />
                         </div>
                     </div>
-                    <div class="row px-3" >
+                    <div class="row">
                         <div class="col">
                             <textboxQuestion
                             class="mt-4"
@@ -120,7 +120,7 @@
                             />
                         </div>
                     </div>
-                    <div class="row mb-2 ">
+                    <div class="row mb-3">
                         <buttonQuestion
                         class="px-0 mt-4"
                         cmsWidgetName="GlassOnlyQuestion"

From 98f33c4296fe12164d59856fe7fcab1977140e8d Mon Sep 17 00:00:00 2001
From: shnsuku <78136029+shnsuku@users.noreply.github.com>
Date: Wed, 3 May 2023 16:49:28 +0530
Subject: [PATCH 4/8] Update service-location.vue

---
 src/layouts/service-location/service-location.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e7488f34..9351aff7 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -233,7 +233,7 @@ export default {
 }
 .question-text {
     & > span {
-        line-height: 1.500rem;
+        line-height: 1.5rem;
     }
 }
 .list-card-content p {

From 030335d161d2388a0dfa149a6ca2ccbebc60b0e7 Mon Sep 17 00:00:00 2001
From: shnsuku <78136029+shnsuku@users.noreply.github.com>
Date: Wed, 3 May 2023 16:50:29 +0530
Subject: [PATCH 5/8] Delete service-location.vue

---
 .../service-location/service-location.vue     | 272 ------------------
 1 file changed, 272 deletions(-)
 delete mode 100644 src/layouts/service-location/service-location.vue

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
deleted file mode 100644
index 9351aff7..00000000
--- a/src/layouts/service-location/service-location.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm"  v-slot="{ meta }" >
-        <div class="page-container-grouped-styles">
-            <div class="fade-on-route-transition position-relative">
-                <siteHeader cmsWidgetName="SiteHeaderWidget" />
-                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" id="sub-header" />
-                <div class="select-car">
-                    <div class="container-fluid pb-2">
-                        <div class="row px-3">
-                            <div class="col">
-                                <div class="select-car-form rounded">
-                                    <serviceZipModalQuestion
-                                        v-model="serviceZipCodeQuestion"
-                                        ref="serviceZipCodeQuestion"
-                                        @updated-serviceability="setServiceabilityDetails"
-                                        @updated-contains-military-base="setContainsMilitaryBase"
-                                        modalWidgetName="ServiceZipModalWidget" />
-                                    <alert
-                                        ref="alertMilitaryBaseZip"
-                                        class="my-5"
-                                        cmsWidgetName="AlertMilitaryBaseZipWidget"
-                                        v-if="displayMilitaryZipAlert"
-                                        alertClass="alert-warning" />
-                                    <buttonQuestion
-                                        cmsWidgetName="ServiceTypeQuestionWidget"
-                                        :questionText="questionText"
-                                        :answers="answersFromCms"
-                                        buttonTypeString="listCard"
-                                        isRequired
-                                        v-model="selectedAppointmentType"
-                                        validationRules="selection-required"
-                                        class="service-location-button-question mb-1"/>
-                                        <div class="select-car">
-                                        <div class="container-fluid pb-2">
-                                            <div class="row px-3">
-                                                <div class="col">
-                                                    <div class="select-car-form rounded">
-                                                        <siteFooter
-                                                        cmsWidgetName="SiteFooterWidget"
-                                                        :isForwardActionDisabled="!meta.valid"
-                                                        @backClicked="backButtonAction"
-                                                        @forwardClicked="forwardButtonAction"
-                                                        ref="siteFooter"
-                                                        />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </Form>
-</template>
-<script>
-// Import Supporting Files
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-import { required } from "@/helpers/validation-rules";
-import { errorMessages } from "@/constants/error-messages";
-import buttonQuestion from "@/digital-components/button-question/button-question";
-import { useMainStore } from "@/store";
-import { getServiceabilityDetails, getZipCodeData } from "@/helpers/service-location-helper";
-
-// Import Component
-import alert from "@/ux-components/alert/alert";
-import baseFormMixin from "@/mixins/base-form-mixin";
-import baseMixin from "@/mixins/base-mixin";
-import { Form, defineRule } from "vee-validate";
-import siteFooter from "@/iss-components/site-footer/site-footer.vue";
-import siteHeader from "@/iss-components/site-header/site-header.vue";
-import siteSubHeader from "@/iss-components/site-sub-header/site-sub-header.vue";
-import serviceZipModalQuestion from '@/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue';
-
-// DEFINE VALIDATION RULES
-defineRule("selection-required", required(errorMessages.OPTION_REQUIRED));
-export default {
-    name: "service-location",
-    mixins: [baseFormMixin, baseMixin],
-    async beforeRouteEnter(to, from, next) {
-        // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
-
-        const serviceZipCode = useMainStore().order.customer.address.zipCode;
-        const zipCodeData = getZipCodeData(serviceZipCode);
-
-        const serviceabilityDetailsPromise = getServiceabilityDetails(serviceZipCode);
-        
-        // Settle promises and get results
-        const promiseResultMap = [
-            {
-                resultKey: "cmsContent",
-                promise: cmsContentPromise,
-            },
-            {
-                resultKey: "serviceabilityDetails",
-                promise: serviceabilityDetailsPromise,
-            },
-            {
-                resultKey: "zipCodeData",
-                promise: zipCodeData,
-            },
-        ];
-
-        const resultMap = await settleAllPromises(promiseResultMap);
-        
-        next((vm) => {
-            vm.setCmsContent(resultMap.cmsContent);
-            vm.setData(
-                resultMap.zipCodeData,
-                resultMap.serviceabilityDetails,
-            )
-        });
-    },
-    setup() {
-        const mainStore = useMainStore();
-        return { mainStore };
-    },
-    data() {
-        return {
-            zipCode: this.mainStore.order.customer.address.zipCode,
-            state: this.mainStore.order.customer.address.state,
-            isServiceZipServiceable: null,
-            isGlassServiceableMobile: null,
-            isRecalibrationServiceableMobile: null,
-            selectedAppointmentType: "",
-            zipContainsMilitaryBase: false,
-        };
-    },
-    computed: {
-        questionText() {
-            return this.getCmsContent("ServiceTypeQuestionWidget", "QuestionText");
-        },
-        answersFromCms() {
-            return this.getCmsContent("ServiceTypeQuestionWidget", "Answers");
-        },
-        serviceZipCodeQuestion: {
-            get: function() {
-                return {
-                    zipCode: this.zipCode,
-                    state: this.state,
-                };
-            },
-            set: function (newValue) {
-                if (newValue.zipCode !== this.zipCode) {
-                    this.selectedAppointmentType = null;
-                }
-
-                this.zipCode = newValue.zipCode;
-                this.state = newValue.state;
-
-                this.$nextTick();
-            },
-        },
-        isServiceableMobile() {
-            if (this.isRecalibrationServiceableMobile !== null) {
-                return this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
-            } else {
-                return this.isGlassServiceableMobile;
-            }
-        },
-        displayMilitaryZipAlert() {
-            return this.zipContainsMilitaryBase && this.isServiceableMobile;
-        }        
-    },
-    methods: {
-        arePagePrerequisiteValid() {
-            return true;
-        },
-        backButtonAction() {
-            /**
-            * this.navigationScenarios comes from base-mixin
-            */
-            this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
-        },
-        async forwardButtonAction() {
-            //validate and save data here
-            this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route);
-        },
-        resetDependentState() {
-
-        },
-        setData(zipCodeData, serviceabilityDetails) {
-            if (zipCodeData) {
-                this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
-            }
-            if (serviceabilityDetails) {
-                this.setServiceabilityDetails(serviceabilityDetails);
-            }
-        },
-        setContainsMilitaryBase(val) {
-            if (this.zipContainsMilitaryBase !== val) {
-                this.zipContainsMilitaryBase = val;
-            }
-        },
-        setServiceabilityDetails(serviceabilityDetails) {
-            this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
-            this.isRecalibrationServiceableInshop =
-                serviceabilityDetails.isRecalibrationServiceableInshop;
-            this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
-            this.isRecalibrationServiceableMobile =
-                serviceabilityDetails.isRecalibrationServiceableMobile;
-        },
-    },
-    components: {
-        siteFooter,
-        siteHeader,
-        siteSubHeader,
-        buttonQuestion,
-        Form,
-        serviceZipModalQuestion,
-        alert
-    },
-};
-</script>
-
-<style lang="scss">
-
-.page-container-grouped-styles {
-    overflow: auto;
-}
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-#sub-header span {
-    color: $black;
-}
-.question-text {
-    & > span {
-        line-height: 1.5rem;
-    }
-}
-.list-card-content p {
-    &:first-of-type {
-        line-height: 1.5rem;
-    }
-    &:not(:nth-of-type(1)){
-        line-height: 1.250rem;
-    }
-}
-.siteHeader{
-    .site-header{
-        margin-bottom: 1.25rem !important;
-    }
-
-}
-.choose-option{
-    .button-question >div {
-        &:first-of-type {
-            margin-bottom: 0.95rem;
-            line-height: 1.500rem;
-        }
-    }
-}
-.button-question{
-    .row.form-test-error{
-        line-height:1.500rem;
-        padding-left: 0rem !important;
-    }
-}
-.service-location-button-question {
-    .question-text {
-        margin-top: 1.5rem;
-    }
-}
-</style>

From 9ee71bfbf5ce2867ae5670ca29995dc86b40b652 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Wed, 3 May 2023 16:55:33 +0530
Subject: [PATCH 6/8] Revert "Delete service-location.vue"

This reverts commit 030335d161d2388a0dfa149a6ca2ccbebc60b0e7.
---
 .../service-location/service-location.vue     | 272 ++++++++++++++++++
 1 file changed, 272 insertions(+)
 create mode 100644 src/layouts/service-location/service-location.vue

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
new file mode 100644
index 00000000..9351aff7
--- /dev/null
+++ b/src/layouts/service-location/service-location.vue
@@ -0,0 +1,272 @@
+<template>
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm"  v-slot="{ meta }" >
+        <div class="page-container-grouped-styles">
+            <div class="fade-on-route-transition position-relative">
+                <siteHeader cmsWidgetName="SiteHeaderWidget" />
+                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" id="sub-header" />
+                <div class="select-car">
+                    <div class="container-fluid pb-2">
+                        <div class="row px-3">
+                            <div class="col">
+                                <div class="select-car-form rounded">
+                                    <serviceZipModalQuestion
+                                        v-model="serviceZipCodeQuestion"
+                                        ref="serviceZipCodeQuestion"
+                                        @updated-serviceability="setServiceabilityDetails"
+                                        @updated-contains-military-base="setContainsMilitaryBase"
+                                        modalWidgetName="ServiceZipModalWidget" />
+                                    <alert
+                                        ref="alertMilitaryBaseZip"
+                                        class="my-5"
+                                        cmsWidgetName="AlertMilitaryBaseZipWidget"
+                                        v-if="displayMilitaryZipAlert"
+                                        alertClass="alert-warning" />
+                                    <buttonQuestion
+                                        cmsWidgetName="ServiceTypeQuestionWidget"
+                                        :questionText="questionText"
+                                        :answers="answersFromCms"
+                                        buttonTypeString="listCard"
+                                        isRequired
+                                        v-model="selectedAppointmentType"
+                                        validationRules="selection-required"
+                                        class="service-location-button-question mb-1"/>
+                                        <div class="select-car">
+                                        <div class="container-fluid pb-2">
+                                            <div class="row px-3">
+                                                <div class="col">
+                                                    <div class="select-car-form rounded">
+                                                        <siteFooter
+                                                        cmsWidgetName="SiteFooterWidget"
+                                                        :isForwardActionDisabled="!meta.valid"
+                                                        @backClicked="backButtonAction"
+                                                        @forwardClicked="forwardButtonAction"
+                                                        ref="siteFooter"
+                                                        />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </Form>
+</template>
+<script>
+// Import Supporting Files
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import { useMainStore } from "@/store";
+import { getServiceabilityDetails, getZipCodeData } from "@/helpers/service-location-helper";
+
+// Import Component
+import alert from "@/ux-components/alert/alert";
+import baseFormMixin from "@/mixins/base-form-mixin";
+import baseMixin from "@/mixins/base-mixin";
+import { Form, defineRule } from "vee-validate";
+import siteFooter from "@/iss-components/site-footer/site-footer.vue";
+import siteHeader from "@/iss-components/site-header/site-header.vue";
+import siteSubHeader from "@/iss-components/site-sub-header/site-sub-header.vue";
+import serviceZipModalQuestion from '@/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue';
+
+// DEFINE VALIDATION RULES
+defineRule("selection-required", required(errorMessages.OPTION_REQUIRED));
+export default {
+    name: "service-location",
+    mixins: [baseFormMixin, baseMixin],
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
+
+        const serviceZipCode = useMainStore().order.customer.address.zipCode;
+        const zipCodeData = getZipCodeData(serviceZipCode);
+
+        const serviceabilityDetailsPromise = getServiceabilityDetails(serviceZipCode);
+        
+        // Settle promises and get results
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+            {
+                resultKey: "serviceabilityDetails",
+                promise: serviceabilityDetailsPromise,
+            },
+            {
+                resultKey: "zipCodeData",
+                promise: zipCodeData,
+            },
+        ];
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+        
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+            vm.setData(
+                resultMap.zipCodeData,
+                resultMap.serviceabilityDetails,
+            )
+        });
+    },
+    setup() {
+        const mainStore = useMainStore();
+        return { mainStore };
+    },
+    data() {
+        return {
+            zipCode: this.mainStore.order.customer.address.zipCode,
+            state: this.mainStore.order.customer.address.state,
+            isServiceZipServiceable: null,
+            isGlassServiceableMobile: null,
+            isRecalibrationServiceableMobile: null,
+            selectedAppointmentType: "",
+            zipContainsMilitaryBase: false,
+        };
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent("ServiceTypeQuestionWidget", "QuestionText");
+        },
+        answersFromCms() {
+            return this.getCmsContent("ServiceTypeQuestionWidget", "Answers");
+        },
+        serviceZipCodeQuestion: {
+            get: function() {
+                return {
+                    zipCode: this.zipCode,
+                    state: this.state,
+                };
+            },
+            set: function (newValue) {
+                if (newValue.zipCode !== this.zipCode) {
+                    this.selectedAppointmentType = null;
+                }
+
+                this.zipCode = newValue.zipCode;
+                this.state = newValue.state;
+
+                this.$nextTick();
+            },
+        },
+        isServiceableMobile() {
+            if (this.isRecalibrationServiceableMobile !== null) {
+                return this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            } else {
+                return this.isGlassServiceableMobile;
+            }
+        },
+        displayMilitaryZipAlert() {
+            return this.zipContainsMilitaryBase && this.isServiceableMobile;
+        }        
+    },
+    methods: {
+        arePagePrerequisiteValid() {
+            return true;
+        },
+        backButtonAction() {
+            /**
+            * this.navigationScenarios comes from base-mixin
+            */
+            this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
+        },
+        async forwardButtonAction() {
+            //validate and save data here
+            this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+        },
+        resetDependentState() {
+
+        },
+        setData(zipCodeData, serviceabilityDetails) {
+            if (zipCodeData) {
+                this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
+            }
+            if (serviceabilityDetails) {
+                this.setServiceabilityDetails(serviceabilityDetails);
+            }
+        },
+        setContainsMilitaryBase(val) {
+            if (this.zipContainsMilitaryBase !== val) {
+                this.zipContainsMilitaryBase = val;
+            }
+        },
+        setServiceabilityDetails(serviceabilityDetails) {
+            this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
+            this.isRecalibrationServiceableInshop =
+                serviceabilityDetails.isRecalibrationServiceableInshop;
+            this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
+            this.isRecalibrationServiceableMobile =
+                serviceabilityDetails.isRecalibrationServiceableMobile;
+        },
+    },
+    components: {
+        siteFooter,
+        siteHeader,
+        siteSubHeader,
+        buttonQuestion,
+        Form,
+        serviceZipModalQuestion,
+        alert
+    },
+};
+</script>
+
+<style lang="scss">
+
+.page-container-grouped-styles {
+    overflow: auto;
+}
+.modal-open {
+    .page-container-grouped-styles {
+        overflow: hidden;
+    }
+}
+#sub-header span {
+    color: $black;
+}
+.question-text {
+    & > span {
+        line-height: 1.5rem;
+    }
+}
+.list-card-content p {
+    &:first-of-type {
+        line-height: 1.5rem;
+    }
+    &:not(:nth-of-type(1)){
+        line-height: 1.250rem;
+    }
+}
+.siteHeader{
+    .site-header{
+        margin-bottom: 1.25rem !important;
+    }
+
+}
+.choose-option{
+    .button-question >div {
+        &:first-of-type {
+            margin-bottom: 0.95rem;
+            line-height: 1.500rem;
+        }
+    }
+}
+.button-question{
+    .row.form-test-error{
+        line-height:1.500rem;
+        padding-left: 0rem !important;
+    }
+}
+.service-location-button-question {
+    .question-text {
+        margin-top: 1.5rem;
+    }
+}
+</style>

From 190a09d7b8d1aadc8879f08b2b6979e1a07a4268 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Wed, 3 May 2023 17:00:37 +0530
Subject: [PATCH 7/8] SSR-411

Pushing the height auto
---
 src/layouts/welcome-page/welcome-page.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 4979b279..95468975 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -325,6 +325,9 @@ export default {
 .my-2 {
     margin-bottom: 0rem !important;
 }
+.page-container-grouped-styles.welcome {
+    height: auto;
+}
 @-moz-document url-prefix() {
     // Temporary solution that prevents the Continue button from being hidden in Firefox
     #welcomeFooter {

From e361363d835147e6ced933cffe3e590ac108cf01 Mon Sep 17 00:00:00 2001
From: sheena <sheena.sukumaran@safelite.com>
Date: Wed, 3 May 2023 20:31:29 +0530
Subject: [PATCH 8/8] SSR-411

Updated the spacing between the button
---
 src/layouts/policy-vehicles/policy-vehicles.vue   | 4 ++--
 src/layouts/service-location/service-location.vue | 9 ++-------
 src/layouts/welcome-page/welcome-page.vue         | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index 8059b5b8..f86c8ced 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -4,12 +4,12 @@
             <div class="fade-on-route-transition position-relative">
                 <siteHeader class="mb-2 header" cmsWidgetName="SiteHeaderWidget"/>
                 <div class="select-car">
-                    <div class="container-fluid pb-2">
+                    <div class="container-fluid pb-2 px-5">
                         <div class="row">
                             <div class="col">
                                 <div class="select-car-form rounded text-center">
                                     <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="true" class="mt-2 mb-4" />
-                                    <policyVehiclesQuestion class="px-4" cmsWidgetName="PolicyVehiclesQuestion" :vehicles="VehiclesForQuestions" validationRules="option-required"/>
+                                    <policyVehiclesQuestion  cmsWidgetName="PolicyVehiclesQuestion" :vehicles="VehiclesForQuestions" validationRules="option-required"/>
                                     <siteFooter cmsWidgetName="SiteFooterWidget" ref="siteFooter" :isForwardActionDisabled="!meta.valid" @ForwardClicked="forwardButtonAction" @back-clicked="backButtonAction"/>
                                 </div>
                             </div>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 9351aff7..ab42ce9b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -32,8 +32,8 @@
                                         class="service-location-button-question mb-1"/>
                                         <div class="select-car">
                                         <div class="container-fluid pb-2">
-                                            <div class="row px-3">
-                                                <div class="col">
+                                            <div class="row">
+                                                <div class="col px-0">
                                                     <div class="select-car-form rounded">
                                                         <siteFooter
                                                         cmsWidgetName="SiteFooterWidget"
@@ -244,12 +244,7 @@ export default {
         line-height: 1.250rem;
     }
 }
-.siteHeader{
-    .site-header{
-        margin-bottom: 1.25rem !important;
-    }
 
-}
 .choose-option{
     .button-question >div {
         &:first-of-type {
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 95468975..0410c1aa 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -102,7 +102,7 @@
                             validationRules="loss-city-required" />
                         </div>
                     </div>
-                    <div class="row px-3">
+                    <div class="row">
                         <div class="col">
                             <dropdownQuestion
                             class="mt-4"