From 97b7933cc3d3b7f1694a38ce22b514d0e65e77cb Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 25 Apr 2025 14:35:46 +0530 Subject: [PATCH 1/3] CASH-205 remove extra space and use of css constants --- .../afterpay-breakout/afterpay-breakout.vue | 65 ++++++++++++------- src/styles/ux-variables.scss | 6 ++ 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue index 06a717289..7fabe40aa 100644 --- a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue +++ b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue @@ -3,18 +3,16 @@
-   {{ this.afterpayPrice }}
-   - -   + + data-bind="click:afterpayLearnMore" + class="afterpay-learn-more"> Info Icon
@@ -151,8 +149,8 @@ export default { &.alert-info { .alert-heading { - color: #000000; - font-weight: 600; + color: $black; + font-weight: $font-weight-600; margin-left: 0.5rem; margin-right: 0.5rem; @include media-breakpoint-up(md) { @@ -162,11 +160,12 @@ export default { } } .afterpay-amount { - color: #0c7e47; + color: $green; + margin-left: 0.125rem; } .alert-sub-heading { - color: #4b4c4e; - font-weight: 400; + color: $gray-1100; + font-weight: $font-weight-normal; } .after-pay { .after-pay-toggle { @@ -180,7 +179,7 @@ export default { background-position: right center; margin-left: 0.5rem; width: 1rem; - height: 9px; + height: 0.5625rem; display: inline-flex; } &.expanded:after { @@ -194,8 +193,8 @@ export default { } } .after-pay-toggle a { - font-weight: 600; - color: #0070d1; + font-weight: $font-weight-600; + color: $blue; text-decoration: none; } .after-pay-details { @@ -218,27 +217,45 @@ export default { .payment-card { display: flex; flex-direction: column; - border-radius: 6px; - border: 0.25px #b3b4b5; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 0.375rem; + border: 0.25px $gray-1000; + box-shadow: 0px 4px 8px -4px rgba(0, 0, 0, 0.15); } .calendar-section { - background-color: #fff; /* White background for calendar area */ + background-color: $white; /* White background for calendar area */ padding: 0.5rem; text-align: center; - gap: 2px; - font-weight: 700; + gap: 0.125rem; + font-weight: $font-weight-700; white-space: nowrap; + border-top-left-radius: 0.375rem; + border-top-right-radius: 0.375rem; + width: 4.375rem; + @include media-breakpoint-up(md) { + width: 5rem; + } } .payment-amount-section { - background-color: #e0f7e9; /* Light green background for payment area */ + background-color: $green-600; /* Light green background for payment area */ padding: 0.5rem; text-align: center; - font-weight: 700; + font-weight: $font-weight-700; + border-bottom-left-radius: 0.375rem; + border-bottom-right-radius: 0.375rem; + width: 4.375rem; + @include media-breakpoint-up(md) { + width: 5rem; + } + } + .afterpay-learn-more { + margin-left: 0.125rem; + } + .afterpay-image { + margin-left: 0.125rem; } .amount-due { - color: #00723e; /* Green text */ + color: $green-1000; /* Green text */ } .legend { display: flex; @@ -249,11 +266,11 @@ export default { .legend-item { display: flex; align-items: center; - gap: 2px; + gap: 0.125rem; white-space: nowrap; } .legend-item span { - font-weight: 400; + font-weight: $font-weight-normal; } } diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index 5c4045fd7..6f377a068 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -33,9 +33,11 @@ $green-300: #94d7b6; $green-400: #5abc8c; // Used in theme $green-500: #2ca168; $green: #0c7e47; // Default Green +$green-600: #e7f2ed; $green-700: #006a36; $green-800: #004f28; $green-900: #00331a; +$green-1000: #00723e; // Yellows $yellow-100: #fff5eb; @@ -59,6 +61,8 @@ $gray-600: #4d5151; // Used in theme $gray-700: #303333; // Used in theme $gray-800: #222424; // Used in theme $gray-900: #181a1a; // Used in theme +$gray-1000: #b3b4b5; +$gray-1100: #4b4c4e; //orange $orange-600: #e86421; @@ -134,6 +138,8 @@ $font-weight-lighter: lighter; $font-weight-light: 300; $font-weight-normal: 400; $font-weight-bold: 500; +$font-weight-600: 600; +$font-weight-700: 700; $font-weight-bolder: bolder; //Headings From a7e9d7c8fe4554d1979036100d4dced479752d0c Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 25 Apr 2025 19:33:19 +0530 Subject: [PATCH 2/3] CASH-205 more margin for amount info icon and afterpay image --- .../payment-method/afterpay-breakout/afterpay-breakout.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue index 7fabe40aa..90a3edeb1 100644 --- a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue +++ b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue @@ -161,7 +161,7 @@ export default { } .afterpay-amount { color: $green; - margin-left: 0.125rem; + margin-left: 0.250rem; } .alert-sub-heading { color: $gray-1100; @@ -248,10 +248,10 @@ export default { } } .afterpay-learn-more { - margin-left: 0.125rem; + margin-left: 0.250rem; } .afterpay-image { - margin-left: 0.125rem; + margin-left: 0.250rem; } .amount-due { From 9d0bfa3ae281a847f3cbc5cf42801ef291698852 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 25 Apr 2025 19:37:50 +0530 Subject: [PATCH 3/3] CASH-205 formatting --- .../payment-method/afterpay-breakout/afterpay-breakout.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue index 90a3edeb1..0e1e3d58a 100644 --- a/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue +++ b/src/layouts/payment-method/afterpay-breakout/afterpay-breakout.vue @@ -161,7 +161,7 @@ export default { } .afterpay-amount { color: $green; - margin-left: 0.250rem; + margin-left: 0.25rem; } .alert-sub-heading { color: $gray-1100; @@ -248,10 +248,10 @@ export default { } } .afterpay-learn-more { - margin-left: 0.250rem; + margin-left: 0.25rem; } .afterpay-image { - margin-left: 0.250rem; + margin-left: 0.25rem; } .amount-due {