diff --git a/src/frontend/apps/impress/cunningham.ts b/src/frontend/apps/impress/cunningham.ts index d0df17aa..1b6481ab 100644 --- a/src/frontend/apps/impress/cunningham.ts +++ b/src/frontend/apps/impress/cunningham.ts @@ -36,10 +36,6 @@ const customColors = { 'yellow-500': '#B7A73F', 'yellow-600': '#66673D', }; -tokens.themes.default.theme.colors = { - ...tokens.themes.default.theme.colors, - ...customColors, -}; tokens.themes.default.theme = { ...tokens.themes.default.theme, @@ -50,6 +46,10 @@ tokens.themes.default.theme = { widthHeader: '', widthFooter: '', }, + colors: { + ...tokens.themes.default.theme.colors, + ...customColors, + }, }, }; @@ -60,6 +60,11 @@ tokens.themes.default.components = { 'home-proconnect': false, beta: false, 'image-system-filter': '', + favicon: { + ico: '/assets/favicon-light.ico', + 'png-light': '/assets/favicon-light.png', + 'png-dark': '/assets/favicon-dark.png', + }, }, }; @@ -80,6 +85,11 @@ const dsfrTheme = { 'la-gaufre': true, 'home-proconnect': true, beta: true, + favicon: { + ico: '/assets/favicon-dsfr.ico', + 'png-light': '/assets/favicon-dsfr.png', + 'png-dark': '/assets/favicon-dark-dsfr.png', + }, }, }, }; diff --git a/src/frontend/apps/impress/public/favicon-dark.png b/src/frontend/apps/impress/public/assets/favicon-dark-dsfr.png similarity index 100% rename from src/frontend/apps/impress/public/favicon-dark.png rename to src/frontend/apps/impress/public/assets/favicon-dark-dsfr.png diff --git a/src/frontend/apps/impress/public/assets/favicon-dark.png b/src/frontend/apps/impress/public/assets/favicon-dark.png new file mode 100644 index 00000000..1d05fec8 Binary files /dev/null and b/src/frontend/apps/impress/public/assets/favicon-dark.png differ diff --git a/src/frontend/apps/impress/public/favicon.ico b/src/frontend/apps/impress/public/assets/favicon-dsfr.ico similarity index 100% rename from src/frontend/apps/impress/public/favicon.ico rename to src/frontend/apps/impress/public/assets/favicon-dsfr.ico diff --git a/src/frontend/apps/impress/public/favicon.png b/src/frontend/apps/impress/public/assets/favicon-dsfr.png similarity index 100% rename from src/frontend/apps/impress/public/favicon.png rename to src/frontend/apps/impress/public/assets/favicon-dsfr.png diff --git a/src/frontend/apps/impress/public/assets/favicon-light.ico b/src/frontend/apps/impress/public/assets/favicon-light.ico new file mode 100644 index 00000000..b4255b9f Binary files /dev/null and b/src/frontend/apps/impress/public/assets/favicon-light.ico differ diff --git a/src/frontend/apps/impress/public/assets/favicon-light.png b/src/frontend/apps/impress/public/assets/favicon-light.png new file mode 100644 index 00000000..19cc87d7 Binary files /dev/null and b/src/frontend/apps/impress/public/assets/favicon-light.png differ diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css index a81fac53..2fdb9326 100644 --- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css +++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css @@ -491,6 +491,9 @@ --c--components--home-proconnect: false; --c--components--beta: false; --c--components--image-system-filter: ; + --c--components--favicon--ico: /assets/favicon-light.ico; + --c--components--favicon--png-light: /assets/favicon-light.png; + --c--components--favicon--png-dark: /assets/favicon-dark.png; } .cunningham-theme--dark { @@ -551,6 +554,9 @@ --c--components--la-gaufre: true; --c--components--home-proconnect: true; --c--components--beta: true; + --c--components--favicon--ico: /assets/favicon-dsfr.ico; + --c--components--favicon--png-light: /assets/favicon-dsfr.png; + --c--components--favicon--png-dark: /assets/favicon-dark-dsfr.png; } .cunningham-theme--generic { diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts index 7bd34015..a547d659 100644 --- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts +++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts @@ -367,6 +367,11 @@ export const tokens = { 'home-proconnect': false, beta: false, 'image-system-filter': '', + favicon: { + ico: '/assets/favicon-light.ico', + 'png-light': '/assets/favicon-light.png', + 'png-dark': '/assets/favicon-dark.png', + }, }, }, dark: { @@ -431,7 +436,16 @@ export const tokens = { alt: 'Gouvernement Logo', }, }, - components: { 'la-gaufre': true, 'home-proconnect': true, beta: true }, + components: { + 'la-gaufre': true, + 'home-proconnect': true, + beta: true, + favicon: { + ico: '/assets/favicon-dsfr.ico', + 'png-light': '/assets/favicon-dsfr.png', + 'png-dark': '/assets/favicon-dark-dsfr.png', + }, + }, }, generic: { theme: { diff --git a/src/frontend/apps/impress/src/pages/_app.tsx b/src/frontend/apps/impress/src/pages/_app.tsx index 73e41fac..2015f7ae 100644 --- a/src/frontend/apps/impress/src/pages/_app.tsx +++ b/src/frontend/apps/impress/src/pages/_app.tsx @@ -3,6 +3,7 @@ import Head from 'next/head'; import { useTranslation } from 'react-i18next'; import { AppProvider } from '@/core/'; +import { useCunninghamTheme } from '@/cunningham'; import { useOffline, useSWRegister } from '@/features/service-worker/'; import '@/i18n/initI18n'; import { NextPageWithLayout } from '@/types/next'; @@ -18,6 +19,8 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) { useOffline(); const getLayout = Component.getLayout ?? ((page) => page); const { t } = useTranslation(); + const { componentTokens } = useCunninghamTheme(); + const favicon = componentTokens['favicon']; return ( <> @@ -29,17 +32,17 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) { 'Docs: Your new companion to collaborate on documents efficiently, intuitively, and securely.', )} /> - - + +