From cc7747089ffdf4cf2ae54a65a083f9c1cb94e10f Mon Sep 17 00:00:00 2001 From: Nathan Vasse Date: Thu, 12 Sep 2024 15:18:50 +0200 Subject: [PATCH] wip --- src/frontend/apps/impress/.env | 2 +- src/frontend/apps/impress/cunningham.ts | 15 ++++++++++++++- .../apps/impress/public/assets/logo-opendesk.svg | 12 ++++++++++++ .../impress/src/cunningham/cunningham-style.css | 14 ++++++++++++++ .../impress/src/cunningham/cunningham-tokens.css | 9 +++++++++ .../impress/src/cunningham/cunningham-tokens.ts | 13 +++++++++++++ .../docs/docs-grid/components/DocsGrid.tsx | 10 +++++----- 7 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 src/frontend/apps/impress/public/assets/logo-opendesk.svg diff --git a/src/frontend/apps/impress/.env b/src/frontend/apps/impress/.env index e04335f5a..033fe3995 100644 --- a/src/frontend/apps/impress/.env +++ b/src/frontend/apps/impress/.env @@ -1,4 +1,4 @@ NEXT_PUBLIC_API_ORIGIN= NEXT_PUBLIC_Y_PROVIDER_URL= NEXT_PUBLIC_MEDIA_URL= -NEXT_PUBLIC_THEME=dsfr +NEXT_PUBLIC_THEME=openDesk diff --git a/src/frontend/apps/impress/cunningham.ts b/src/frontend/apps/impress/cunningham.ts index 43b220b64..8aae071c0 100644 --- a/src/frontend/apps/impress/cunningham.ts +++ b/src/frontend/apps/impress/cunningham.ts @@ -234,14 +234,21 @@ const config = { font: { families: { accent: 'Open Sans', - base: 'Marianne', + base: 'Open Sans', }, }, + logo: { + src: '/assets/logo-opendesk.svg', + widthHeader: '110px', + widthFooter: '220px', + alt: 'Gouvernement Logo', + }, }, components: { button: { 'medium-height': '48px', 'border-radius': '8px', + 'font-weight': '600', primary: { background: { color: 'var(--c--theme--colors--primary-700)', @@ -277,6 +284,12 @@ const config = { 'color-hover': 'var(--c--theme--colors--primary-text)', }, }, + datagrid: { + header: { + color: 'var(--c--theme--colors--primary-600)', + size: 'var(--c--theme--font--sizes--s)', + }, + }, }, }, }, diff --git a/src/frontend/apps/impress/public/assets/logo-opendesk.svg b/src/frontend/apps/impress/public/assets/logo-opendesk.svg new file mode 100644 index 000000000..d5aedc8c0 --- /dev/null +++ b/src/frontend/apps/impress/public/assets/logo-opendesk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-style.css b/src/frontend/apps/impress/src/cunningham/cunningham-style.css index c99954d45..188298a8a 100644 --- a/src/frontend/apps/impress/src/cunningham/cunningham-style.css +++ b/src/frontend/apps/impress/src/cunningham/cunningham-style.css @@ -27,6 +27,16 @@ border-color: var(--c--components--button--primary--border--color-active); } +/** + * DataGrid +*/ + +.c__datagrid__table__container > table th .c__datagrid__header { + color: var(--c--components--datagrid--header--color); + font-weight: var(--c--components--datagrid--header--weight); + font-size: var(--c--components--datagrid--header--size); +} + /** * Modal */ @@ -50,6 +60,10 @@ z-index: 10000; } +/** + * DataGrid +*/ + .cunningham-theme--dsfr { .c__input, .c__field, diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css index a28c27bba..e5b170df4 100644 --- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css +++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css @@ -363,8 +363,13 @@ --c--theme--colors--secondary-900: #004039; --c--theme--font--families--accent: Open Sans; --c--theme--font--families--base: Open Sans; + --c--theme--logo--src: /assets/logo-opendesk.svg; + --c--theme--logo--widthHeader: 110px; + --c--theme--logo--widthFooter: 220px; + --c--theme--logo--alt: Gouvernement Logo; --c--components--button--medium-height: 48px; --c--components--button--border-radius: 8px; + --c--components--button--font-weight: 600; --c--components--button--primary--background--color: var( --c--theme--colors--primary-700 ); @@ -403,6 +408,10 @@ --c--components--button--tertiary-text--color-hover: var( --c--theme--colors--primary-text ); + --c--components--datagrid--header--color: var( + --c--theme--colors--primary-600 + ); + --c--components--datagrid--header--size: var(--c--theme--font--sizes--s); } .clr-secondary-text { color: var(--c--theme--colors--secondary-text); diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts index 2e8277139..7ff0e2b45 100644 --- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts +++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts @@ -386,11 +386,18 @@ export const tokens = { 'secondary-900': '#004039', }, font: { families: { accent: 'Open Sans', base: 'Open Sans' } }, + logo: { + src: '/assets/logo-opendesk.svg', + widthHeader: '110px', + widthFooter: '220px', + alt: 'Gouvernement Logo', + }, }, components: { button: { 'medium-height': '48px', 'border-radius': '8px', + 'font-weight': '600', primary: { background: { color: 'var(--c--theme--colors--primary-700)', @@ -423,6 +430,12 @@ export const tokens = { 'color-hover': 'var(--c--theme--colors--primary-text)', }, }, + datagrid: { + header: { + color: 'var(--c--theme--colors--primary-600)', + size: 'var(--c--theme--font--sizes--s)', + }, + }, }, }, }, diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx index de90bc69d..8f2e14720 100644 --- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx +++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx @@ -131,7 +131,7 @@ export const DocsGrid = () => { renderCell: ({ row }) => { return ( - + {row.title} @@ -144,7 +144,7 @@ export const DocsGrid = () => { renderCell: ({ row }) => { return ( - + {formatDate(row.created_at)} @@ -157,7 +157,7 @@ export const DocsGrid = () => { renderCell: ({ row }) => { return ( - + {formatDate(row.updated_at)} @@ -170,7 +170,7 @@ export const DocsGrid = () => { renderCell: ({ row }) => { return ( - + {transRole(currentDocRole(row.abilities))} @@ -183,7 +183,7 @@ export const DocsGrid = () => { renderCell: ({ row }) => { return ( - + {row.accesses.length}