From a090c92d8507e0897e380670439c752ddd2c057e Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 15 Dec 2024 09:44:40 +0000 Subject: [PATCH 01/14] Init --- src/main/scss/abstracts/_theme.scss | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index f1248e5b21de..62e427fa44df 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -2,16 +2,17 @@ @use "../base/breakpoints"; $colors: ( - "blue": #006fe6, - "brown": #a2845e, - "cyan": #32ade6, - "green": #1ea64b, - "indigo": #5856d6, - "orange": #fe820a, - "pink": #fb0f45, - "purple": #af52de, - "red": #e6001f, - "yellow": #ffb31a, + "blue": oklch(56.4% 0.2257 257.41), + "brown": oklch(63.24% 0.0757 72.67), + "cyan": oklch(69.92% 0.1497 234.48), + "green": oklch(63.35% 0.188 148.27), + "indigo": oklch(52.94% 0.191 278.34), + "orange": oklch(73.01% 0.1905 53.01), + "pink": oklch(62.44% 0.2568 21.06), + "purple": oklch(61.49% 0.2129 312.42), + "red": oklch(57.65% 0.2453 27.03), + "yellow": oklch(83.93% 0.17 76), + "teal": oklch(65.68% 0.1122 216.72), "white": #fff, "black": #14141f, ); @@ -370,8 +371,8 @@ $semantics: ( --#{$key}: #{$value}; @if $key != "black" and $key != "white" { - --light-#{$key}: #{lighten($value, 20%)}; - --dark-#{$key}: #{darken($value, 20%)}; + --light-#{$key}: #{color.adjust($value, $lightness: 20%)}; + --dark-#{$key}: #{color.adjust($value, $lightness: -20%)}; } } From 6cb8d2f145efc02aeb7e719d0b782b66cb566b45 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 15 Dec 2024 10:11:13 +0000 Subject: [PATCH 02/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 62e427fa44df..b2e80ac31992 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -2,15 +2,15 @@ @use "../base/breakpoints"; $colors: ( - "blue": oklch(56.4% 0.2257 257.41), - "brown": oklch(63.24% 0.0757 72.67), - "cyan": oklch(69.92% 0.1497 234.48), - "green": oklch(63.35% 0.188 148.27), - "indigo": oklch(52.94% 0.191 278.34), - "orange": oklch(73.01% 0.1905 53.01), - "pink": oklch(62.44% 0.2568 21.06), - "purple": oklch(61.49% 0.2129 312.42), - "red": oklch(57.65% 0.2453 27.03), + "blue": oklch(58.61% 0.2308 256.91), + "brown": oklch(63.25% 0.0941 72.67), + "cyan": oklch(70% 0.1497 234.48), + "green": oklch(65.73% 0.2155 150), + "indigo": oklch(57.42% 0.191 278.34), + "orange": oklch(74.04% 0.2001 50.74), + "pink": oklch(63.95% 0.2601 21.9), + "purple": oklch(60.98% 0.2001 308.19), + "red": oklch(62.46% 0.2671 30), "yellow": oklch(83.93% 0.17 76), "teal": oklch(65.68% 0.1122 216.72), "white": #fff, From 8404fa33f473ee65c5946aea3d7255ded05b8a4b Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 15 Dec 2024 10:53:34 +0000 Subject: [PATCH 03/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index b2e80ac31992..8327ed71a818 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -2,19 +2,19 @@ @use "../base/breakpoints"; $colors: ( - "blue": oklch(58.61% 0.2308 256.91), - "brown": oklch(63.25% 0.0941 72.67), - "cyan": oklch(70% 0.1497 234.48), - "green": oklch(65.73% 0.2155 150), - "indigo": oklch(57.42% 0.191 278.34), - "orange": oklch(74.04% 0.2001 50.74), - "pink": oklch(63.95% 0.2601 21.9), - "purple": oklch(60.98% 0.2001 308.19), - "red": oklch(62.46% 0.2671 30), - "yellow": oklch(83.93% 0.17 76), - "teal": oklch(65.68% 0.1122 216.72), + "blue": oklch(55% 0.2308 256.91), + "brown": oklch(60% 0.0941 72.67), + "cyan": oklch(60% 0.1497 234.48), + "green": oklch(70% 0.2155 150), + "indigo": oklch(60% 0.191 278.34), + "orange": oklch(70% 0.2001 50.74), + "pink": oklch(60% 0.2601 12.28), + "purple": oklch(60% 0.2308 314.6), + "red": oklch(60% 0.2671 30), + "yellow": oklch(80% 0.17 76), + "teal": oklch(60% 0.1122 216.72), "white": #fff, - "black": #14141f, + "black": oklch(2% 0.075 260), ); $semantics: ( @@ -53,7 +53,7 @@ $semantics: ( --dark-grey: #4d545d; // branding - --secondary: rgb(96, 125, 159); + --secondary: oklch(from var(--black) 60% c h); --focus-input-border: var(--accent-color); --focus-input-glow: color-mix(in sRGB, var(--accent-color) 15%, transparent); @@ -171,7 +171,7 @@ $semantics: ( --btn-link-bg--active: var(--light-grey); // Table - --table-background: var(--panel-header-bg-color); + --table-background: oklch(from var(--text-color-secondary) l c h / 0.1); --table-header-foreground: var(--text-color); --table-body-background: var(--background); --table-body-foreground: var(--text-color); @@ -258,13 +258,13 @@ $semantics: ( --card-background: var(--background); --card-background--hover: transparent; --card-background--active: transparent; - --card-border-color: hsla(240, 25%, 75%, 0.25); - --card-border-color--hover: hsla(240, 25%, 75%, 0.5); - --card-border-color--active: hsla(240, 25%, 75%, 0.75); + --card-border-color: oklch(from var(--text-color-secondary) l c h / 0.15); + --card-border-color--hover: oklch(from var(--text-color-secondary) l c h / 0.3); + --card-border-color--active: oklch(from var(--text-color-secondary) l c h / 0.5); --card-border-width: 2px; // Tab bar - --tabs-background: var(--panel-header-bg-color); + --tabs-background: oklch(from var(--text-color-secondary) l c h / 0.1); --tabs-item-background: transparent; --tabs-item-foreground: var(--text-color); --tabs-item-background--hover: rgba(0, 0, 0, 0.05); @@ -350,15 +350,15 @@ $semantics: ( --auto-complete-bg-color--prehighlight: #b3d4ff; // Default button - --button-background: hsla(240, 25%, 75%, 0.1); - --button-background--hover: hsla(240, 25%, 75%, 0.175); - --button-background--active: hsla(240, 25%, 75%, 0.25); - --button-box-shadow--focus: hsla(240, 25%, 75%, 0.1); + --button-background: oklch(from var(--text-color-secondary) l c h / 0.075); + --button-background--hover: oklch(from var(--text-color-secondary) l c h / 0.15); + --button-background--active: oklch(from var(--text-color-secondary) l c h / 0.25); + --button-box-shadow--focus: oklch(from var(--text-color-secondary) l c h / 0.1); // Variables for sidebar items, card items - --item-background--hover: hsla(240, 25%, 75%, 0.15); - --item-background--active: hsla(240, 25%, 75%, 0.225); - --item-box-shadow--focus: hsla(240, 25%, 75%, 0.105); + --item-background--hover: oklch(from var(--text-color-secondary) l c h / 0.1); + --item-background--active: oklch(from var(--text-color-secondary) l c h / 0.15); + --item-box-shadow--focus: oklch(from var(--text-color-secondary) l c h / 0.1); // Deprecated --primary: var(--accent-color); // Use var(--accent-color) instead From 7ff3eb8cc8c0348de4abce69a97e145e6c54e797 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 15 Dec 2024 11:57:00 +0000 Subject: [PATCH 04/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 8327ed71a818..3d8620391f87 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -90,7 +90,7 @@ $semantics: ( --header-item-border-radius: 4px; // Breadcrumbs bar - --breadcrumbs-bar-background: hsla(240, 20%, 96.5%, 0.8); + --breadcrumbs-bar-background: oklch(0.968 0.005 260 / 80%); // Alert call outs --alert-success-text-color: var(--success-color); From eed06b6b4a7dc3df52d1c0998d0979980290f1b7 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:06:31 +0000 Subject: [PATCH 05/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 3d8620391f87..1b6b1ea07c62 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -14,7 +14,7 @@ $colors: ( "yellow": oklch(80% 0.17 76), "teal": oklch(60% 0.1122 216.72), "white": #fff, - "black": oklch(2% 0.075 260), + "black": oklch(2% 0.075 256.91), ); $semantics: ( @@ -84,7 +84,7 @@ $semantics: ( --search-bg: var(--white); --search-box-completion-bg: var(--primary-hover); --search-box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.3); - --header-bg-classic: #000; + --header-bg-classic: var(--black); --header-link-bg-classic-hover: #404040; --header-link-bg-classic-active: #404040; --header-item-border-radius: 4px; From 0bcb651d77f228b827cad18f485bb22935aa7b32 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:07:56 +0000 Subject: [PATCH 06/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 1b6b1ea07c62..84f0b9c68c11 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -351,8 +351,8 @@ $semantics: ( // Default button --button-background: oklch(from var(--text-color-secondary) l c h / 0.075); - --button-background--hover: oklch(from var(--text-color-secondary) l c h / 0.15); - --button-background--active: oklch(from var(--text-color-secondary) l c h / 0.25); + --button-background--hover: oklch(from var(--text-color-secondary) l c h / 0.125); + --button-background--active: oklch(from var(--text-color-secondary) l c h / 0.175); --button-box-shadow--focus: oklch(from var(--text-color-secondary) l c h / 0.1); // Variables for sidebar items, card items From 6056e08d3dba85644b270c8f07077385e3c1f6b4 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:10:34 +0000 Subject: [PATCH 07/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 84f0b9c68c11..a799973144d3 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -14,7 +14,7 @@ $colors: ( "yellow": oklch(80% 0.17 76), "teal": oklch(60% 0.1122 216.72), "white": #fff, - "black": oklch(2% 0.075 256.91), + "black": oklch(from var(--accent-color) 2% 0.075 h) ); $semantics: ( From 7020eb3668915f5aba70ea07cf01547435ffb3df Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:13:09 +0000 Subject: [PATCH 08/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index a799973144d3..b85234b4d969 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -325,7 +325,7 @@ $semantics: ( --form-input-glow--focus: 0 0 0 5px var(--focus-input-glow); --pre-background: rgba(0, 0, 0, 0.05); --pre-color: var(--text-color); - --selection-color: rgba(2, 76, 182, 0.3); + --selection-color: oklch(from var(--accent-color) l c h / 0.2); // Animations --standard-transition: 0.3s ease; From 6a236f6b4f25503dfbcb112428d80600581ecfdc Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:15:40 +0000 Subject: [PATCH 09/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index b85234b4d969..d326b2e39c04 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -14,7 +14,7 @@ $colors: ( "yellow": oklch(80% 0.17 76), "teal": oklch(60% 0.1122 216.72), "white": #fff, - "black": oklch(from var(--accent-color) 2% 0.075 h) + "black": oklch(from var(--accent-color) 2% 0.075 h), ); $semantics: ( @@ -90,7 +90,7 @@ $semantics: ( --header-item-border-radius: 4px; // Breadcrumbs bar - --breadcrumbs-bar-background: oklch(0.968 0.005 260 / 80%); + --breadcrumbs-bar-background: oklch(96.8% 0.005 260 / 0.8); // Alert call outs --alert-success-text-color: var(--success-color); @@ -259,8 +259,12 @@ $semantics: ( --card-background--hover: transparent; --card-background--active: transparent; --card-border-color: oklch(from var(--text-color-secondary) l c h / 0.15); - --card-border-color--hover: oklch(from var(--text-color-secondary) l c h / 0.3); - --card-border-color--active: oklch(from var(--text-color-secondary) l c h / 0.5); + --card-border-color--hover: oklch( + from var(--text-color-secondary) l c h / 0.3 + ); + --card-border-color--active: oklch( + from var(--text-color-secondary) l c h / 0.5 + ); --card-border-width: 2px; // Tab bar @@ -351,13 +355,21 @@ $semantics: ( // Default button --button-background: oklch(from var(--text-color-secondary) l c h / 0.075); - --button-background--hover: oklch(from var(--text-color-secondary) l c h / 0.125); - --button-background--active: oklch(from var(--text-color-secondary) l c h / 0.175); - --button-box-shadow--focus: oklch(from var(--text-color-secondary) l c h / 0.1); + --button-background--hover: oklch( + from var(--text-color-secondary) l c h / 0.125 + ); + --button-background--active: oklch( + from var(--text-color-secondary) l c h / 0.175 + ); + --button-box-shadow--focus: oklch( + from var(--text-color-secondary) l c h / 0.1 + ); // Variables for sidebar items, card items --item-background--hover: oklch(from var(--text-color-secondary) l c h / 0.1); - --item-background--active: oklch(from var(--text-color-secondary) l c h / 0.15); + --item-background--active: oklch( + from var(--text-color-secondary) l c h / 0.15 + ); --item-box-shadow--focus: oklch(from var(--text-color-secondary) l c h / 0.1); // Deprecated From 5a7aa6c93aec0052d836de7f46f499cc7cc069bb Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:24:47 +0000 Subject: [PATCH 10/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index d326b2e39c04..725655be6ab2 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -90,7 +90,7 @@ $semantics: ( --header-item-border-radius: 4px; // Breadcrumbs bar - --breadcrumbs-bar-background: oklch(96.8% 0.005 260 / 0.8); + --breadcrumbs-bar-background: oklch(from var(--text-color) 96.8% 0.005 h / 0.8); // Alert call outs --alert-success-text-color: var(--success-color); From 548d35592b7f8b587f98edbc72f47a3ba373679c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:25:07 +0000 Subject: [PATCH 11/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 725655be6ab2..71f621a7a218 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -90,7 +90,9 @@ $semantics: ( --header-item-border-radius: 4px; // Breadcrumbs bar - --breadcrumbs-bar-background: oklch(from var(--text-color) 96.8% 0.005 h / 0.8); + --breadcrumbs-bar-background: oklch( + from var(--text-color) 96.8% 0.005 h / 0.8 + ); // Alert call outs --alert-success-text-color: var(--success-color); From f3a0705f73f1fd8b50dbbdef9b20c08a805b8ac7 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Mon, 23 Dec 2024 18:35:32 +0000 Subject: [PATCH 12/14] Use htmlunit snapshot --- test/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/pom.xml b/test/pom.xml index 2320e7a2ad8b..56d84a44e806 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -136,6 +136,12 @@ THE SOFTWARE. workflow-support 936.v9fa_77211ca_e1 + + + org.htmlunit + htmlunit + 4.8.0-SNAPSHOT + From b67919f5161ae281b4d379483b369520d6194f3c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:01:22 +0000 Subject: [PATCH 13/14] Update _theme.scss --- src/main/scss/abstracts/_theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 70dfbc33ad4e..9013839fb804 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -83,7 +83,7 @@ $semantics: ( --search-input-color: var(--brand-link-color); --search-bg: var(--white); --search-box-completion-bg: var(--primary-hover); - --search-box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.3); + --search-box-shadow: 0 1px 7px 0 rgb(0 0 0 / 0.3); --header-bg-classic: var(--black); --header-link-bg-classic-hover: #404040; --header-link-bg-classic-active: #404040; From fe7bb28c96cbb3405309e7ba992b2af439f11035 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:57:24 +0000 Subject: [PATCH 14/14] Update pom.xml --- test/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index ddf58c55c282..b2f6f87cad23 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -136,12 +136,6 @@ THE SOFTWARE. workflow-support 936.v9fa_77211ca_e1 - - - org.htmlunit - htmlunit - 4.8.0-SNAPSHOT -