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

Merge pull request #1204 from Safelite/bugfix/CSR-1454

Browse source 
Bugfix/CSR-1454
This commit is contained in:
AdamCaouetteSafelite 2023-07-05 15:12:43 -04:00 committed by GitHub
commit e015e350bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/helpers/cms-content-helper.js
View file

@ -296,7 +296,7 @@ export function doesCopyContainTextLink(copy) {
* @returns array of strings * @returns array of strings
*/ */
export function splitCopyOnCMSPlaceHolder(copy) { export function splitCopyOnCMSPlaceHolder(copy) {
return copy.split(/{(.*?)}/g); return copy.split(/{(.*?)}/g).filter((str) => str.length > 0);
} }
/** /**

13
src/layouts/schedule/schedule.vue
View file

@ -8,7 +8,7 @@
<textBlock <textBlock
cmsWidgetName="ChangeShopLink" cmsWidgetName="ChangeShopLink"
justifyText="center" justifyText="center"
class="mb-3" class="mb-3 text-link-small"
marginTopSizeOverride="1" /> marginTopSizeOverride="1" />
</template> </template>
<location-alerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" /> <location-alerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" />
@ -16,6 +16,7 @@
selectableDatesSetting="custom" selectableDatesSetting="custom"
ref="datePicker" ref="datePicker"
v-model="selectedDate" v-model="selectedDate"
class="text-link-small"
:customSelectableDatesCallback="getAvailableDatesMethod" :customSelectableDatesCallback="getAvailableDatesMethod"
@date-clicked="openInshopTimeSlotsModal" /> @date-clicked="openInshopTimeSlotsModal" />
<time-slot-modal-question <time-slot-modal-question
@ -489,3 +490,13 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss">
.text-link-small {
a,
.btn-link {
font-size: 0.875rem;
line-height: 1.5;
}
}
</style>