From 92230ff2a8cc8e8cab06f3c845ef3eba9475b783 Mon Sep 17 00:00:00 2001 From: Florent Gravin Date: Tue, 24 Oct 2023 23:08:38 +0200 Subject: [PATCH 1/9] style(text): respect mockup text colors black when black main when 555 on the geo2france mockup --- libs/ui/dataviz/src/lib/figure/figure.component.html | 4 ++-- .../record-preview-feed/record-preview-feed.component.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/ui/dataviz/src/lib/figure/figure.component.html b/libs/ui/dataviz/src/lib/figure/figure.component.html index 6ee20e6df3..180c9e62cb 100644 --- a/libs/ui/dataviz/src/lib/figure/figure.component.html +++ b/libs/ui/dataviz/src/lib/figure/figure.component.html @@ -11,10 +11,10 @@ {{ icon }}
-
+
{{ figure }} {{ unit }}
-
{{ title }}
+
{{ title }}
diff --git a/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.html b/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.html index 25c60138fb..93a0d51703 100644 --- a/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.html +++ b/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.html @@ -40,7 +40,7 @@ > {{ contact.firstName }} {{ contact.lastName }} -

+

record.was.created.time @@ -55,12 +55,12 @@ >

{{ record.title }}

-

{{ abstract }}

+

{{ abstract }}

Date: Tue, 24 Oct 2023 23:13:34 +0200 Subject: [PATCH 2/9] style(md-info): homogeneize rendering of metadata info blocks add a

with a margin for consistency sake --- .../src/lib/metadata-info/metadata-info.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html index 440e1ddee3..ee2d778187 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html @@ -41,19 +41,19 @@ >

record.metadata.updatedOn

-

+

{{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}

record.metadata.updateFrequency

-

+

domain.record.updateFrequency.{{ metadata.updateFrequency }}

record.metadata.updateStatus

-

+

domain.record.status.{{ metadata.status }}

From a58f81fb9fbaeff7fcae25ff211ed6c231292ca7 Mon Sep 17 00:00:00 2001 From: Florent Gravin Date: Tue, 24 Oct 2023 23:17:01 +0200 Subject: [PATCH 3/9] style(expandable): transition to 300ms --- .../src/lib/expandable-panel/expandable-panel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html index 9c07e761f8..2984ea4d6a 100644 --- a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html +++ b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html @@ -15,7 +15,7 @@
Date: Tue, 24 Oct 2023 23:23:46 +0200 Subject: [PATCH 4/9] style(org): remove the weird org card hover effect remove shadow and border-none --- .../organisation-preview/organisation-preview.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html b/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html index f8a3f1049e..25a94bc86d 100644 --- a/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html +++ b/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html @@ -4,7 +4,7 @@ [title]="organisation.name" >
Date: Tue, 24 Oct 2023 23:24:19 +0200 Subject: [PATCH 5/9] style(preview): add title color transition on org & record previews --- .../organisation-preview/organisation-preview.component.html | 2 +- .../lib/record-preview-row/record-preview-row.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html b/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html index 25a94bc86d..126bef177a 100644 --- a/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html +++ b/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html @@ -15,7 +15,7 @@
{{ organisation.name }}
{{ record.title }} From bf166d1f75f412c3022b1971172d28c8596361e6 Mon Sep 17 00:00:00 2001 From: Florent Gravin Date: Tue, 24 Oct 2023 23:25:16 +0200 Subject: [PATCH 6/9] style(conf): propose a #555 as default text color --- apps/metadata-editor/src/app/app.module.ts | 2 +- conf/default.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/metadata-editor/src/app/app.module.ts b/apps/metadata-editor/src/app/app.module.ts index 93a9fc7d21..0df8bf2962 100644 --- a/apps/metadata-editor/src/app/app.module.ts +++ b/apps/metadata-editor/src/app/app.module.ts @@ -72,7 +72,7 @@ export class AppModule { ThemeService.applyCssVariables( getThemeConfig().PRIMARY_COLOR, getThemeConfig().SECONDARY_COLOR, - getThemeConfig().MAIN_COLOR || '#475569', + getThemeConfig().MAIN_COLOR || '#555', getThemeConfig().BACKGROUND_COLOR, getThemeConfig().MAIN_FONT || "'Rubik', sans-serif", getThemeConfig().TITLE_FONT || "'Readex Pro', sans-serif", diff --git a/conf/default.toml b/conf/default.toml index 307c4c72a9..462af0dcd2 100644 --- a/conf/default.toml +++ b/conf/default.toml @@ -41,7 +41,7 @@ proxy_path = "" [theme] primary_color = "#c82850" secondary_color = "#001638" -main_color = "#212029" # All-purpose text color +main_color = "#555" # All-purpose text color background_color = "#fdfbff" # These optional parameters indicate which background should be used for the main header and the text color used From c5138e12aad009e6f78475b97cf78e7999101a35 Mon Sep 17 00:00:00 2001 From: Florent Gravin Date: Wed, 25 Oct 2023 10:42:26 +0200 Subject: [PATCH 7/9] style(misc): remove useless duration-250 class --- .../src/lib/expandable-panel/expandable-panel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html index 2984ea4d6a..c70b79eefa 100644 --- a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html +++ b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html @@ -15,7 +15,7 @@
Date: Wed, 25 Oct 2023 10:53:52 +0200 Subject: [PATCH 8/9] test(figure): fix text-black check --- libs/ui/dataviz/src/lib/figure/figure.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts b/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts index 010ef74e0f..e41a9faf81 100644 --- a/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts +++ b/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts @@ -62,7 +62,7 @@ describe('FigureComponent', () => { }) it('label is main text color', () => { expect(compiled.querySelector('.figure-block')?.className).toContain( - 'text-main' + 'text-black' ) }) it('has a tooltip containing the information', () => { From 44f34f868e90fe93f617d3eda39f15efdce59fe1 Mon Sep 17 00:00:00 2001 From: Florent Gravin Date: Fri, 3 Nov 2023 13:17:36 +0100 Subject: [PATCH 9/9] test(figures): fix test label for black title color --- libs/ui/dataviz/src/lib/figure/figure.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts b/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts index e41a9faf81..b587252eb9 100644 --- a/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts +++ b/libs/ui/dataviz/src/lib/figure/figure.component.spec.ts @@ -60,7 +60,7 @@ describe('FigureComponent', () => { 'bg-primary' ) }) - it('label is main text color', () => { + it('label is black text color', () => { expect(compiled.querySelector('.figure-block')?.className).toContain( 'text-black' )