diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 0dabc80e3..55e062e24 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -1312,7 +1312,7 @@ export default { .amount-paid, .donation-amount { font-family: - UrbanistSemibold, AvertaSemibold; //Okay to remove AvertaSemibold after 2025.06.19 merge/release + UrbanistSemibold, AvertaSemibold; /* Okay to remove AvertaSemibold after 2025.06.19 merge/release */ color: $black; } .sub-total { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 8c548a906..21629a6f7 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -543,8 +543,14 @@ export default { this.updateSupportingItems(); if (this.displayWaitList) { - var gaLabel = ""; - const status = this.waitListRequested ? "checked" : "unchecked"; + let gaLabel = ""; + let status = this.waitListRequested ? "checked" : "unchecked"; + if ( + this.waitListRequested === null && + this.$store.state.order.customer.waitListRequested === true + ) { + status = "checked"; + } const type = store.getters.isMobileAppointment ? "mobile" : "inshop"; gaLabel = `${status}_${type}`; diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index f5f306517..e1a138031 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -133,4 +133,4 @@ caption, url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff"); font-weight: normal; font-style: normal; -} \ No newline at end of file +} diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index 69ba0d7ac..01b122b31 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -121,8 +121,8 @@ $body-color: $gray-600; //Fonts $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; -$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", - monospace; +$font-family-monospace: + UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // stylelint-enable value-keyword-case $font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace;