From cf9aa0d43d5b35549d6bb7b4a87605bd1f6f57bd Mon Sep 17 00:00:00 2001 From: Sneha Date: Thu, 7 Nov 2024 11:57:46 +0530 Subject: [PATCH 1/2] CSR-2308 --- src/digital-components/modal/modal.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index 3dc6e4afd..02164a05c 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -73,6 +73,11 @@ export default { resetForm, }; }, + data() { + return { + isEnterClicked: false, + }; + }, methods: { async validateAndEmit() { const validationResult = await this.validate(); @@ -84,9 +89,14 @@ export default { }, async onEnter(e) { e.preventDefault(); + if (this.isEnterClicked) return; + this.isEnterClicked = true; document.getElementById("modalbtn")?.focus(); this.$refs.modalButtonMain.clicked(); document.getElementById(this.modalId)?.focus(); + setTimeout(() => { + this.isEnterClicked = false; + }, 2000); }, resetButtonStyle() { this.$refs.modalButtonMain?.resetButtonStyle(); From dbb2621e671c65a473803c4fdd3a5ce6d6af1e11 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 8 Nov 2024 09:10:51 -0500 Subject: [PATCH 2/2] CSR-2346 fix misaligned promo copy. Update colors and font sizes with variable and REM values. --- .../promo-modal-question/promo-modal-question.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue index a6b591e67..9f102fd52 100644 --- a/src/fmg-components/promo-modal-question/promo-modal-question.vue +++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue @@ -50,7 +50,7 @@ cmsWidgetName="AlertInshopPromoWidget" alertClass="alert-danger" v-bind:isDismissible="false" /> -
+
Promo code {{ promoCode }} applied @@ -357,19 +357,18 @@ export default {