jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-1144

Browse source
This commit is contained in:
CarlNation 2023-06-13 06:08:24 -04:00
commit 1e0b170dde
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
View file

@ -24,7 +24,7 @@
validationRules="time-slot-required" validationRules="time-slot-required"
class="mt-5" /> class="mt-5" />
<div <div
class="mt-1 mb-2" class="mt-1 mb-2 supplemental-information"
v-if="supplementalInformationBlock" v-if="supplementalInformationBlock"
v-html="supplementalInformationBlock"></div> v-html="supplementalInformationBlock"></div>
<textBlock <textBlock
@ -32,7 +32,7 @@
:customText="dropoffDisclaimerText" :customText="dropoffDisclaimerText"
justifyText="left" justifyText="left"
typeStyle="caption" typeStyle="caption"
class="mb-2" /> class="mb-2 mt-4" />
</modal> </modal>
</template> </template>
@ -110,8 +110,9 @@ export default {
if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) { if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
return null; return null;
} else if (this.appointmentType === AppointmentTypeStrings.MOBILE) { } else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
appointmentTypeCmsWidgetName = appointmentTypeCmsWidgetName = this.selectedTimeSlotId?.includes(
this.selectedTimeSlotId === this.premiumAppointmentButtonText PREMIUM_TIME_SLOT_ID_FLAG
)
? this.mobilePremiumCmsWidgetName ? this.mobilePremiumCmsWidgetName
: this.mobileCmsWidgetName; : this.mobileCmsWidgetName;
} else { } else {
@ -317,5 +318,15 @@ export default {
.text-block.duration-text-block { .text-block.duration-text-block {
margin-top: 0 !important; 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> </style>

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

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