From 282c41d91a580161a1242f96ecba75b8c24f814c Mon Sep 17 00:00:00 2001 From: Anton Fast Date: Mon, 22 Jan 2024 11:32:33 +0100 Subject: [PATCH 1/7] pfe-199: Changed color for brand-seconday-hover, btn-active-color and btn-secondary-hover --- src/less/components/payex/button.less | 2 +- src/less/variables-payex.less | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/less/components/payex/button.less b/src/less/components/payex/button.less index be26d9eb43..17505e6035 100644 --- a/src/less/components/payex/button.less +++ b/src/less/components/payex/button.less @@ -33,7 +33,7 @@ } &:active { - border: 1px solid @brand-secondary-info-1; + border: 1px solid @brand-primary; } } diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index 293e75b28a..3acbc0748c 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -157,7 +157,7 @@ body { /* TODO: to be converted: --brand-primary-faded: fade(var(--brand-primary, #2A9D3F), 60%); */ --brand-secondary: #3c3c3c; - --brand-secondary-hover: #5f5f5f; + --brand-secondary-hover: #707070; --brand-secondary-light-1: var(--brand-secondary, #3c3c3c); --brand-secondary-light-2: #c8c8c8; --brand-secondary-light-3: var(--brand-secondary-light-2, #c8c8c8); @@ -215,7 +215,7 @@ body { --btn-secondary-bg: var(--brand-secondary, #3c3c3c); --btn-secondary-text-color: var(--brand-secondary, #3c3c3c); --btn-secondary-border-color: var(--brand-secondary, #3c3c3c); - --btn-secondary-hover: var(--brand-secondary, #3c3c3c); + --btn-secondary-hover: var(--brand-secondary-hover, #707070); --btn-secondary-disabled-color: var(--white, #ffffff); --btn-secondary-disabled-bg: var(--brand-secondary-light-2, #c8c8c8); @@ -240,7 +240,7 @@ body { /* Shared button variables */ --btn-disabled-text: var(--text-disabled); --btn-bg-disabled: rgb(212 196 188 / 30%); - --btn-active-color: var(--payex-light-blue); + --btn-active-color: var(--brand-secondary, #3c3c3c); /* INPUTS COLORS */ --input-color: var(--brand-secondary, #3c3c3c); From b025ed078a4055286164e7d22760aa88521d5e1e Mon Sep 17 00:00:00 2001 From: Anton Fast Date: Mon, 22 Jan 2024 14:32:58 +0100 Subject: [PATCH 2/7] PFE-199: Forgot to change @btn-secondary-hover --- src/less/variables-payex.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index 3acbc0748c..c2bfe8b339 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -75,7 +75,7 @@ @btn-secondary-color: @white; @btn-secondary-bg: @brand-secondary; -@btn-secondary-hover: @brand-primary; +@btn-secondary-hover: @brand-secondary-hover; @btn-secondary-disabled-color: @white; @btn-secondary-disabled-bg: @brand-secondary-light-2; From fdc5c69c6c834a52c4ec55281736f09e8162f042 Mon Sep 17 00:00:00 2001 From: Anton Fast Date: Mon, 22 Jan 2024 14:40:40 +0100 Subject: [PATCH 3/7] PFE-199: hardcoded 707070 for @btn-secondary-hover --- src/less/variables-payex.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index c2bfe8b339..6e7155d54e 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -75,7 +75,7 @@ @btn-secondary-color: @white; @btn-secondary-bg: @brand-secondary; -@btn-secondary-hover: @brand-secondary-hover; +@btn-secondary-hover: #707070; @btn-secondary-disabled-color: @white; @btn-secondary-disabled-bg: @brand-secondary-light-2; From bd95d2a6ec49123c7e0cf213653cfad1ba518d13 Mon Sep 17 00:00:00 2001 From: Anton Fast Date: Mon, 22 Jan 2024 14:52:03 +0100 Subject: [PATCH 4/7] PFE-199: Changed brand-secondary-hover to soft-brown --- src/less/variables-payex.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index 6e7155d54e..dd67978548 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -75,7 +75,7 @@ @btn-secondary-color: @white; @btn-secondary-bg: @brand-secondary; -@btn-secondary-hover: #707070; +@btn-secondary-hover: @soft-brown; @btn-secondary-disabled-color: @white; @btn-secondary-disabled-bg: @brand-secondary-light-2; @@ -215,7 +215,7 @@ body { --btn-secondary-bg: var(--brand-secondary, #3c3c3c); --btn-secondary-text-color: var(--brand-secondary, #3c3c3c); --btn-secondary-border-color: var(--brand-secondary, #3c3c3c); - --btn-secondary-hover: var(--brand-secondary-hover, #707070); + --btn-secondary-hover: var(--soft-brown, #707070); --btn-secondary-disabled-color: var(--white, #ffffff); --btn-secondary-disabled-bg: var(--brand-secondary-light-2, #c8c8c8); From df7bb8ea683043f2a134236714625c8dbe13ccc0 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 22 Jan 2024 14:55:16 +0100 Subject: [PATCH 5/7] Update src/less/components/payex/button.less Co-authored-by: Raphael Ferrand --- src/less/components/payex/button.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/components/payex/button.less b/src/less/components/payex/button.less index 17505e6035..039d3cf44f 100644 --- a/src/less/components/payex/button.less +++ b/src/less/components/payex/button.less @@ -33,7 +33,7 @@ } &:active { - border: 1px solid @brand-primary; + border: 1px solid var(--brand-primary); } } From c3ca6ba5a3e71f2672f32dd370a761651584190e Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 22 Jan 2024 14:57:41 +0100 Subject: [PATCH 6/7] Update src/less/variables-payex.less Co-authored-by: Raphael Ferrand --- src/less/variables-payex.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index dd67978548..c67ece70ef 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -157,7 +157,7 @@ body { /* TODO: to be converted: --brand-primary-faded: fade(var(--brand-primary, #2A9D3F), 60%); */ --brand-secondary: #3c3c3c; - --brand-secondary-hover: #707070; + --brand-secondary-hover: var(--soft-brown, #707070); --brand-secondary-light-1: var(--brand-secondary, #3c3c3c); --brand-secondary-light-2: #c8c8c8; --brand-secondary-light-3: var(--brand-secondary-light-2, #c8c8c8); From f2ff86ab2fcc3e5f398326d682f7fc91a485f743 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 22 Jan 2024 14:57:48 +0100 Subject: [PATCH 7/7] Update src/less/variables-payex.less Co-authored-by: Raphael Ferrand --- src/less/variables-payex.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/variables-payex.less b/src/less/variables-payex.less index c67ece70ef..96f62ce5bd 100644 --- a/src/less/variables-payex.less +++ b/src/less/variables-payex.less @@ -215,7 +215,7 @@ body { --btn-secondary-bg: var(--brand-secondary, #3c3c3c); --btn-secondary-text-color: var(--brand-secondary, #3c3c3c); --btn-secondary-border-color: var(--brand-secondary, #3c3c3c); - --btn-secondary-hover: var(--soft-brown, #707070); + --btn-secondary-hover: var(--brand-secondary-hover, #707070); --btn-secondary-disabled-color: var(--white, #ffffff); --btn-secondary-disabled-bg: var(--brand-secondary-light-2, #c8c8c8);