From caa4243bb1a341d4625a8e3adffea953a379334f Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Thu, 1 May 2025 16:44:41 -0400 Subject: [PATCH 1/3] CASH-556: fix justification --- src/digital-components/date-picker/date-picker.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index b362a9f74..dfe602a61 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1274,7 +1274,6 @@ export default { max-width: 100%; flex-wrap: wrap; gap: 0 0.5rem; - justify-content: center; & > div { flex: 0 0 calc(50% - 0.25rem); From 017f1903eccd9c89d5c8d7353c887948c48388d1 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Thu, 1 May 2025 17:29:09 -0400 Subject: [PATCH 2/3] CASH-556: waitlist adjustments --- .../time-slot-question/time-slot-question.vue | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue index 507f7dea9..72a712552 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -22,6 +22,10 @@ v-model="selectedRouteCode" isRequired validationRules="time-slot-required" /> +
@@ -38,21 +42,17 @@
-
+ class="disclaimer" />
@@ -574,6 +574,7 @@ export default { line-height: 1.5rem; font-size: 0.875rem; text-align: left; + margin: 1.25rem 0 1.5rem; li strong { font-weight: bold; } @@ -586,6 +587,7 @@ export default { border-radius: 8px; font-size: 1rem; padding: 16px; + text-align: left; .ui-checkbox { padding-left: 0px; @@ -599,6 +601,7 @@ export default { } } .waitlist-success { + margin: 1rem 0 0; background-color: #ecf5e9; display: flex; align-items: flex-start; @@ -606,9 +609,11 @@ export default { border-radius: 5px; font-size: 1.125rem; padding: 0.75rem 1rem; - margin-bottom: -0.5rem; .success-text { margin-left: 0.5rem; + p { + margin-bottom: 0; + } } .success-image { margin-top: 4.5px; @@ -617,5 +622,9 @@ export default { color: #0c7e47; } } + .disclaimer { + text-align: left; + margin: 1.5rem 0 0; + } } From a7cc70c41135d6dfe2999f26f64426b651e82837 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Fri, 2 May 2025 13:04:16 -0400 Subject: [PATCH 3/3] CASH-556: more adjustments --- .../date-picker/date-picker.vue | 19 +++++++++++++------ .../time-slot-question/time-slot-question.vue | 7 ++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index dfe602a61..1a7df91e0 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -853,7 +853,7 @@ export default { } } .calendar-grid-container { - margin: 0 auto 2rem auto; + margin: 0 auto 1rem auto; max-width: 400px; position: relative; transition: @@ -1075,12 +1075,16 @@ export default { border-radius: 50%; background-color: $black; position: absolute; - top: 28px; + top: 1.875rem; } .first-day { color: $blue; } } + input[type="radio"]:checked + label:after { + background-color: $black; + top: 2rem; + } } } @@ -1206,6 +1210,7 @@ export default { } } label { + color: $gray-500; flex-direction: column; height: 2.5rem; width: 100%; @@ -1228,10 +1233,11 @@ export default { } } &.current-day { - label:after { - margin-top: -0.25rem; - position: relative; - top: 0.5rem; + label { + font-weight: 600; + font-family: "AvertaSemibold"; + color: $black; + font-size-adjust: 0.5; // needed for Averta fonts baseline alignment } } } @@ -1242,6 +1248,7 @@ export default { color: $black; font-weight: 400; font-family: "AvertaSemibold"; + font-size-adjust: 0.5; // needed for Averta fonts baseline alignment &.price { font-family: "AvertaRegular"; diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue index 72a712552..c86974d3c 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -40,10 +40,7 @@ v-model="waitListRequested" @click="waitListChecked" />
-
+
@@ -574,7 +571,7 @@ export default { line-height: 1.5rem; font-size: 0.875rem; text-align: left; - margin: 1.25rem 0 1.5rem; + margin: 1rem 0 1.5rem; li strong { font-weight: bold; }