From f558a2a50ee779b28954463b5715b850e713cf2e Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:07:12 -0400
Subject: [PATCH 1/9] update styles on view more dates link

---
 src/digital-components/date-picker/date-picker.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 164706893..a61700599 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -1483,6 +1483,8 @@ export default {
     display: block;
     position: relative;
     height: 2rem;
+    font-size: 0.875rem;
+    padding-top: 0;
     width: 100%;
     justify-content: center;
     background: transparent;

From cc0ae31db04193dab5c7937a367476e168f2770f Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:07:37 -0400
Subject: [PATCH 2/9] update styles on shop location

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

diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue
index f4277e43b..111b1a69b 100644
--- a/src/layouts/schedule/shop-location/shop-location.vue
+++ b/src/layouts/schedule/shop-location/shop-location.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="shop-location">
-        <textBlock :customText="questionText" typeStyle="button-question" />
+        <textBlock :customText="questionText" typeStyle="button-question" class="mb-2" />
         <div>
             <div>
                 <label v-for="addressItem in addressDetails" :key="addressItem">

From bc9912e99054e9a1b5ccc741764d8412a3b94cef Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:07:55 -0400
Subject: [PATCH 3/9] update styles on waitlist

---
 .../schedule/time-slot-question/time-slot-question.vue       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 397c76e89..9cb893e22 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -49,6 +49,7 @@
                 cmsWidgetName="WaitListLabelWidget"
                 typeStyle="medium"
                 fontWeight="600"
+                class="waitlist-label"
                 marginTopSizeOverride="0" />
             <checkboxQuestion
                 class="mt-3"
@@ -658,6 +659,10 @@ export default {
         padding: 16px;
         text-align: left;
 
+        .waitlist-label {
+            font-family: UrbanistSemibold;
+        }
+
         .ui-checkbox {
             padding-left: 0px;
             input {

From aafdfe7f5bd8e16889807ace423a8b707a964464 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:08:31 -0400
Subject: [PATCH 4/9] handle special TM trademark styling that would not work
 from CMS

---
 .../schedule/time-slot-question/time-slot-question.vue      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 9cb893e22..ba2021a17 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -9,6 +9,7 @@
             isRequired
             insertOrLabelBeforeFinalOption
             groupName="chooseDropOffOrInshop"
+            class="choose-dropoff-or-inshop"
             validationRules="time-slot-required">
             <div>
                 <alert
@@ -652,6 +653,11 @@ export default {
             margin-bottom: 8px;
         }
     }
+    .button-question.choose-dropoff-or-inshop .button-inner-wrapper .col:first-child .button-content.list-button-content > span::after {
+            content: "TM";
+            vertical-align: super;
+            font-size: 50%;
+    }
     .waitlist {
         box-shadow: 0px 1px 4px 0px #00000033;
         border-radius: 8px;

From cbf0315c17376863b1ec474f758dc4c15735f8a8 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:09:33 -0400
Subject: [PATCH 5/9] split alerts into 2 sections so some are before the
 header and some appear after per Figma

---
 src/layouts/schedule/schedule.vue | 71 +++++++++++++++++--------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d91472cc5..dc65d11e5 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -5,48 +5,18 @@
         <div class="container page-container-grouped-styles">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <alert
-                        ref="alertMilitaryBaseZip"
-                        class="my-5"
-                        cmsWidgetName="AlertMilitaryBaseZipWidget"
-                        v-if="displayMilitaryZipAlert"
-                        alertClass="alert-warning" />
-                    <alert
-                        ref="alertMobileOnly"
-                        class="my-5"
-                        cmsWidgetName="AlertMobileOnlyWidget"
-                        v-if="displayServiceableMobileOnly"
-                        alertClass="alert-warning" />
-                    <alert
-                        ref="alertRecalNoMobile"
-                        class="my-5"
-                        cmsWidgetName="AlertRecalNoMobileWidget"
-                        v-if="displayRecalibrationWarning"
-                        @text-link-clicked="openModalAction"
-                        alertClass="alert-warning" />
-                    <alert
-                        ref="alertInshopOnly"
-                        class="my-5"
-                        cmsWidgetName="AlertInshopOnlyWidget"
-                        v-if="displayServiceableInshopOnly"
-                        alertClass="alert-warning" />
-                    <alert
-                        ref="alertNoShops"
-                        class="my-5"
-                        cmsWidgetName="AlertNoShopsWidget"
-                        v-if="displayNoShopsAlert"
-                        alertClass="alert-warning" />
                     <alert
                         ref="alertMobileFeeFree"
-                        class="my-5"
+                        class="mb-5"
                         cmsWidgetName="AlertMobileFeeFreeWidget"
                         v-if="showMobileFreeAlert"
                         alertClass="alert-success" />
+                    
                 </div>
             </div>
             <div class="row appointment-type">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
-                    <funnelSubHeader cmsWidgetName="ScheduleYourServiceWidget" class="my-5" />
+                    <funnelSubHeader cmsWidgetName="ScheduleYourServiceWidget" class="mb-5" />
                     <appointmentTypeQuestion
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
@@ -62,6 +32,41 @@
                         labelBold="true" />
                 </div>
             </div>
+            <div class="row">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7">
+                    <alert
+                        ref="alertMobileOnly"
+                        class="mb-5"
+                        cmsWidgetName="AlertMobileOnlyWidget"
+                        v-if="displayServiceableMobileOnly"
+                        alertClass="alert-warning" />
+                    <alert
+                        ref="alertRecalNoMobile"
+                        class="mb-5"
+                        cmsWidgetName="AlertRecalNoMobileWidget"
+                        v-if="displayRecalibrationWarning"
+                        @text-link-clicked="openModalAction"
+                        alertClass="alert-warning" />
+                    <alert
+                        ref="alertInshopOnly"
+                        class="mb-5"
+                        cmsWidgetName="AlertInshopOnlyWidget"
+                        v-if="displayServiceableInshopOnly"
+                        alertClass="alert-warning" />
+                    <alert
+                        ref="alertMilitaryBaseZip"
+                        class="mb-5"
+                        cmsWidgetName="AlertMilitaryBaseZipWidget"
+                        v-if="displayMilitaryZipAlert"
+                        alertClass="alert-warning" />
+                    <alert
+                        ref="alertNoShops"
+                        class="mb-5"
+                        cmsWidgetName="AlertNoShopsWidget"
+                        v-if="displayNoShopsAlert"
+                        alertClass="alert-warning" />
+                </div>
+            </div>
             <div
                 v-if="appointmentType && appointmentType === appointmentTypeStrings.MOBILE"
                 class="col-12 col-md-10 col-lg-8 col-xl-7">

From cb7b616ab4449cdf23feb2463910fdc792adebe6 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:10:15 -0400
Subject: [PATCH 6/9] hide the whole appointment question if only one option
 (mobile or inshop) is available

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index dc65d11e5..6456ff28f 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -700,7 +700,7 @@ export default {
             );
         },
         isAppointmentTypeDisplayed() {
-            return this.zipCode && !this.displayNoShopsAlert;
+            return this.zipCode && !this.displayNoShopsAlert && this.isServiceableMobile && this.isServiceableInshop;
         },
         requiresInshopRecalibration() {
             // Specifically check for isRecalibrationServiceableMobile === false, not null or true.

From fb507f358abe8c9ff8565ade68e1382f23ce6253 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:10:39 -0400
Subject: [PATCH 7/9] more style updates

---
 src/layouts/schedule/schedule.vue | 59 +++++++++++--------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 6456ff28f..3c1ae2937 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1744,47 +1744,25 @@ export default {
 
 <style lang="scss">
 .container {
-    &.page-schedule {
-        padding: 0 1rem;
-        .text-link-small {
-            a,
-            .btn-link {
-                width: auto;
-                margin: 0 auto;
-                height: auto;
-                font-size: 0.875rem;
-                line-height: 1.75;
-                padding: 0;
-                border-radius: 0;
-                &:focus {
-                    outline: 1px solid $blue;
-                }
-                @include media-breakpoint-up(md) {
-                    font-size: 1rem;
-                }
-            }
+    .question-text {
+        margin-bottom: 1.5rem;
+
+        & > span {
+            display: flex;
+            justify-content: flex-start;
+            margin-bottom: 0.25rem;
         }
-        .funnel-sub-header {
-            h5.dark-header {
-                margin-bottom: 0.25rem;
-            }
-        }
-        .change-location a {
-            font-family: UrbanistSemibold;
-        }
-        .date-picker {
-            border-top: 1px solid $gray-500;
-            margin-top: 1.5rem;
-        }
-        .time-slots-question {
-            padding: 0 0.75rem;
-        }
-    }
-    .question-text > span {
-        display: flex;
-        justify-content: flex-start;
     }
 }
+.alert.alert-warning {
+
+    .alert-heading {
+        color: $black;
+        font-family: UrbanistSemibold;
+        font-size: 1rem;
+    }
+}
+
 .shop-question-button .list-button-content {
     background: $blue-100;
     box-shadow: 0 0 0 1px $primary;
@@ -1806,6 +1784,7 @@ export default {
 
 .appointment-type .funnel-sub-header h5 {
     font-family: UrbanistRegular;
+    font-size: 1.25rem;
 }
 
 .funnel-sub-header.my-5 h5 {
@@ -1819,4 +1798,8 @@ export default {
     line-height: 26px;
     text-underline-offset: 4px;
 }
+
+.text-block.duration-text-block b {
+    font-family: UrbanistSemibold;
+}
 </style>

From 59e103c4d6c4072484b577d26279bd11277e355e Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:11:30 -0400
Subject: [PATCH 8/9] prettier formatting

---
 src/layouts/schedule/schedule.vue                    |  9 ++++++---
 .../time-slot-question/time-slot-question.vue        | 12 ++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 3c1ae2937..e517d5e8f 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -11,7 +11,6 @@
                         cmsWidgetName="AlertMobileFeeFreeWidget"
                         v-if="showMobileFreeAlert"
                         alertClass="alert-success" />
-                    
                 </div>
             </div>
             <div class="row appointment-type">
@@ -700,7 +699,12 @@ export default {
             );
         },
         isAppointmentTypeDisplayed() {
-            return this.zipCode && !this.displayNoShopsAlert && this.isServiceableMobile && this.isServiceableInshop;
+            return (
+                this.zipCode &&
+                !this.displayNoShopsAlert &&
+                this.isServiceableMobile &&
+                this.isServiceableInshop
+            );
         },
         requiresInshopRecalibration() {
             // Specifically check for isRecalibrationServiceableMobile === false, not null or true.
@@ -1755,7 +1759,6 @@ export default {
     }
 }
 .alert.alert-warning {
-
     .alert-heading {
         color: $black;
         font-family: UrbanistSemibold;
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index ba2021a17..773e5df19 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -653,10 +653,14 @@ export default {
             margin-bottom: 8px;
         }
     }
-    .button-question.choose-dropoff-or-inshop .button-inner-wrapper .col:first-child .button-content.list-button-content > span::after {
-            content: "TM";
-            vertical-align: super;
-            font-size: 50%;
+    .button-question.choose-dropoff-or-inshop
+        .button-inner-wrapper
+        .col:first-child
+        .button-content.list-button-content
+        > span::after {
+        content: "TM";
+        vertical-align: super;
+        font-size: 50%;
     }
     .waitlist {
         box-shadow: 0px 1px 4px 0px #00000033;

From e4eb6e6ccbc4a45f89d8229a75f2aebc46e1e19b Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Thu, 7 Aug 2025 14:33:00 -0400
Subject: [PATCH 9/9] CASH-1186: alert margin adjustment (if under header)

---
 src/layouts/schedule/schedule.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e517d5e8f..7126febf7 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -35,32 +35,32 @@
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <alert
                         ref="alertMobileOnly"
-                        class="mb-5"
+                        class="mt-5 mb-5"
                         cmsWidgetName="AlertMobileOnlyWidget"
                         v-if="displayServiceableMobileOnly"
                         alertClass="alert-warning" />
                     <alert
                         ref="alertRecalNoMobile"
-                        class="mb-5"
+                        class="mt-5 mb-5"
                         cmsWidgetName="AlertRecalNoMobileWidget"
                         v-if="displayRecalibrationWarning"
                         @text-link-clicked="openModalAction"
                         alertClass="alert-warning" />
                     <alert
                         ref="alertInshopOnly"
-                        class="mb-5"
+                        class="mt-5 mb-5"
                         cmsWidgetName="AlertInshopOnlyWidget"
                         v-if="displayServiceableInshopOnly"
                         alertClass="alert-warning" />
                     <alert
                         ref="alertMilitaryBaseZip"
-                        class="mb-5"
+                        class="mt-5 mb-5"
                         cmsWidgetName="AlertMilitaryBaseZipWidget"
                         v-if="displayMilitaryZipAlert"
                         alertClass="alert-warning" />
                     <alert
                         ref="alertNoShops"
-                        class="mb-5"
+                        class="mt-5 mb-5"
                         cmsWidgetName="AlertNoShopsWidget"
                         v-if="displayNoShopsAlert"
                         alertClass="alert-warning" />