From a05951b7ce5160ce73071a2c1785958d07ae07e6 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 5 Jul 2023 10:32:35 -0400 Subject: [PATCH 1/3] CSR-1454: minor tweak to avoid returning empty strings which were creating extra empty markup --- src/helpers/cms-content-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index f4ae0be6d..21a7c5db5 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -296,7 +296,7 @@ export function doesCopyContainTextLink(copy) { * @returns array of strings */ export function splitCopyOnCMSPlaceHolder(copy) { - return copy.split(/{(.*?)}/g); + return copy.split(/{(.*?)}/g).filter(str => str.length > 0); } /** From a4e01e3670d2b7c6be19d21353016c0ba4d27c72 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 5 Jul 2023 11:24:55 -0400 Subject: [PATCH 2/3] CSR-1454: reduce text size of links on Schedule page --- src/layouts/schedule/schedule.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index e26a6c76c..e552f48d0 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -8,7 +8,7 @@ @@ -16,6 +16,7 @@ selectableDatesSetting="custom" ref="datePicker" v-model="selectedDate" + class="text-link-small" :customSelectableDatesCallback="getAvailableDatesMethod" @date-clicked="openInshopTimeSlotsModal" /> + + \ No newline at end of file From b1ad1d921bd7a41d1a5051956f4bc0f02ce7c323 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 5 Jul 2023 11:27:16 -0400 Subject: [PATCH 3/3] CSR-1454: formatting changes --- src/helpers/cms-content-helper.js | 2 +- src/layouts/schedule/schedule.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 21a7c5db5..84a834ee6 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -296,7 +296,7 @@ export function doesCopyContainTextLink(copy) { * @returns array of strings */ export function splitCopyOnCMSPlaceHolder(copy) { - return copy.split(/{(.*?)}/g).filter(str => str.length > 0); + return copy.split(/{(.*?)}/g).filter((str) => str.length > 0); } /** diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index e552f48d0..ea2ae4cfe 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -499,4 +499,4 @@ export default { line-height: 1.5; } } - \ No newline at end of file +