From 17ecf1ebec40ff374b13053b1757864fba8ff043 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Wed, 30 Aug 2023 15:54:37 -0400
Subject: [PATCH] commit before stash

---
 .../service-location/service-location.vue     | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 252741c1..b1fd6449 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -5,52 +5,45 @@
         @submit="onSubmit"
         @invalidSubmit="onInvalidSubmit">
         <div class="page-container-grouped-styles">
-            <div class="fade-on-route-transition position-relative">
-                <siteHeader cmsWidgetName="SiteHeaderWidget" />
-                <siteSubHeader
-                    id="sub-header"
-                    cmsWidgetName="SiteSubHeaderWidget"
-                    class="mt-5" />
-                <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
-                                        ref="serviceZipCodeQuestion"
-                                        v-model="serviceZipCodeQuestion"
-                                        modalWidgetName="ServiceZipModalWidget"
-                                        @updatedServiceability="setServiceabilityDetails"
-                                        @updatedContainsMilitaryBase="setContainsMilitaryBase" />
-                                    <alert
-                                        v-if="displayMilitaryZipAlert"
-                                        ref="alertMilitaryBaseZip"
-                                        class="my-5"
-                                        cmsWidgetName="AlertMilitaryBaseZipWidget"
-                                        alertClass="alert-warning" />
-                                    <buttonQuestion
-                                        v-model="selectedAppointmentType"
-                                        cmsWidgetName="ServiceTypeQuestionWidget"
-                                        :questionText="questionText"
-                                        :answers="answersFromCms"
-                                        buttonTypeString="listCard"
-                                        isRequired
-                                        validationRules="selection-required"
-                                        class="service-location-button-question mb-1" />
-                                        <div class="select-car">
-                                        <siteFooter
-                                            ref="siteFooter"
-                                            class="mt-5"
-                                            cmsWidgetName="SiteFooterWidget"
-                                            :isForwardActionDisabled="!meta.valid"
-                                            @backClicked="backButtonAction"
-                                            @forwardClicked="forwardButtonAction" />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+            <siteHeader cmsWidgetName="SiteHeaderWidget" />
+            <siteSubHeader
+                cmsWidgetName="SiteSubHeaderWidget"
+                class="mt-5" />
+            <div class="main-content-container">
+                <serviceZipModalQuestion
+                    ref="serviceZipCodeQuestion"
+                    v-model="serviceZipCodeQuestion"
+                    modalWidgetName="ServiceZipModalWidget"
+                    @updatedServiceability="setServiceabilityDetails"
+                    @updatedContainsMilitaryBase="setContainsMilitaryBase" />
+                <alert
+                    v-if="displayMilitaryZipAlert"
+                    ref="alertMilitaryBaseZip"
+                    class="my-5"
+                    cmsWidgetName="AlertMilitaryBaseZipWidget"
+                    alertClass="alert-warning" />
+                <alert
+                    v-if="displayServiceableMobileOnly"
+                    ref="alertMobileOnly"
+                    class="my-5"
+                    cmsWidgetName="AlertMobileOnlyWidget"
+                    alertClass="alert-warning" />
+                <buttonQuestion
+                    v-model="selectedAppointmentType"
+                    cmsWidgetName="ServiceTypeQuestionWidget"
+                    :questionText="questionText"
+                    :answers="answersFromCms"
+                    buttonTypeString="listCard"
+                    isRequired
+                    validationRules="selection-required"
+                    class="service-location-button-question mb-1" />
+                <siteFooter
+                    ref="siteFooter"
+                    class="mt-5"
+                    cmsWidgetName="SiteFooterWidget"
+                    :isForwardActionDisabled="!meta.valid"
+                    @backClicked="backButtonAction"
+                    @forwardClicked="forwardButtonAction" />
             </div>
         </div>
     </Form>
@@ -164,8 +157,18 @@ export default {
             }
             return this.isGlassServiceableMobile;
         },
+        isServiceableInshop() {
+            if (this.isRecalibrationServiceableInshop !== null) {
+                return this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
+            }
+
+            return this.isGlassServiceableInshop;
+        },
         displayMilitaryZipAlert() {
             return this.zipContainsMilitaryBase && this.isServiceableMobile;
+        },
+        displayServiceableMobileOnly() {
+            return this.isServiceableMobile && !this.isServiceableInshop;
         }
     },
     methods: {
@@ -214,18 +217,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+$page-side-padding: 1.5rem;
 
 .page-container-grouped-styles {
     overflow: auto;
-}
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
+
+    .main-content-container {
+        padding: 0 1.5rem !important;
     }
 }
-#sub-header span {
-    color: $black;
-}
+
 .question-text {
     & > span {
         line-height: 1.5rem;
@@ -239,7 +240,6 @@ export default {
         line-height: 1.250rem;
     }
 }
-
 .choose-option{
     .button-question >div {
         &:first-of-type {