Merge branch 'develop' into feature/CSR-1144

src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue

@@ -24,7 +24,7 @@
             validationRules="time-slot-required"
             class="mt-5" />
         <div
-            class="mt-1 mb-2"
+            class="mt-1 mb-2 supplemental-information"
             v-if="supplementalInformationBlock"
             v-html="supplementalInformationBlock"></div>
         <textBlock
@@ -32,7 +32,7 @@
             :customText="dropoffDisclaimerText"
             justifyText="left"
             typeStyle="caption"
-            class="mb-2" />
+            class="mb-2 mt-4" />
     </modal>
 </template>
 
@@ -110,10 +110,11 @@ export default {
             if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
                 return null;
             } else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                appointmentTypeCmsWidgetName =
-                    this.selectedTimeSlotId === this.premiumAppointmentButtonText
-                        ? this.mobilePremiumCmsWidgetName
-                        : this.mobileCmsWidgetName;
+                appointmentTypeCmsWidgetName = this.selectedTimeSlotId?.includes(
+                    PREMIUM_TIME_SLOT_ID_FLAG
+                )
+                    ? this.mobilePremiumCmsWidgetName
+                    : this.mobileCmsWidgetName;
             } else {
                 appointmentTypeCmsWidgetName = this.isSameDay
                     ? this.sameDayDropOffCmsWidgetName
@@ -317,5 +318,15 @@ export default {
     .text-block.duration-text-block {
         margin-top: 0 !important;
     }
+    .supplemental-information {
+        line-height: 1.5rem;
+        font-size: 0.875rem;
+        li strong {
+            font-weight: $font-weight-bold;
+        }
+        li:not(:last-child) {
+            margin-bottom: 16px;
+        }
+    }
 }
 </style>

src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue

@@ -205,7 +205,7 @@ export default {
             }
 
             .loader:after {
-                background-color: $gray-300;
+                background-color: $gray-550;
                 height: 1rem;
                 width: 1rem;
             }