diff --git a/app/assets/fonts/Marianne-Regular.woff b/app/assets/fonts/Marianne-Regular.woff new file mode 100644 index 000000000..a95a2d040 Binary files /dev/null and b/app/assets/fonts/Marianne-Regular.woff differ diff --git a/app/assets/fonts/Marianne-Regular.woff2 b/app/assets/fonts/Marianne-Regular.woff2 new file mode 100644 index 000000000..5d6517c80 Binary files /dev/null and b/app/assets/fonts/Marianne-Regular.woff2 differ diff --git a/app/assets/fonts/Muli-Bold.woff b/app/assets/fonts/Muli-Bold.woff deleted file mode 100644 index 32cd7c7b9..000000000 Binary files a/app/assets/fonts/Muli-Bold.woff and /dev/null differ diff --git a/app/assets/fonts/Muli-Bold.woff2 b/app/assets/fonts/Muli-Bold.woff2 deleted file mode 100644 index 238cad90c..000000000 Binary files a/app/assets/fonts/Muli-Bold.woff2 and /dev/null differ diff --git a/app/assets/fonts/Muli-Italic.woff b/app/assets/fonts/Muli-Italic.woff deleted file mode 100644 index 9780f52c7..000000000 Binary files a/app/assets/fonts/Muli-Italic.woff and /dev/null differ diff --git a/app/assets/fonts/Muli-Italic.woff2 b/app/assets/fonts/Muli-Italic.woff2 deleted file mode 100644 index 13b30a7e1..000000000 Binary files a/app/assets/fonts/Muli-Italic.woff2 and /dev/null differ diff --git a/app/assets/fonts/Muli-Regular.woff b/app/assets/fonts/Muli-Regular.woff deleted file mode 100644 index 061938363..000000000 Binary files a/app/assets/fonts/Muli-Regular.woff and /dev/null differ diff --git a/app/assets/fonts/Muli-Regular.woff2 b/app/assets/fonts/Muli-Regular.woff2 deleted file mode 100644 index aabeed2ca..000000000 Binary files a/app/assets/fonts/Muli-Regular.woff2 and /dev/null differ diff --git a/app/assets/fonts/Spectral-Regular.ttf b/app/assets/fonts/Spectral-Regular.ttf new file mode 100644 index 000000000..f9b994210 Binary files /dev/null and b/app/assets/fonts/Spectral-Regular.ttf differ diff --git a/app/assets/stylesheets/_typography.scss b/app/assets/stylesheets/_typography.scss index 3113dfbaf..14b206e2b 100644 --- a/app/assets/stylesheets/_typography.scss +++ b/app/assets/stylesheets/_typography.scss @@ -1,7 +1,7 @@ @import "colors"; %new-type { - font-family: "Muli", system-ui, -apple-system, sans-serif; + font-family: "Marianne", system-ui, -apple-system, sans-serif; color: $black; } diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss index f1524a3bf..07603b370 100644 --- a/app/assets/stylesheets/buttons.scss +++ b/app/assets/stylesheets/buttons.scss @@ -9,7 +9,6 @@ padding: 8px 16px; border-radius: 30px; border: 1px solid $border-grey; - font-family: "Muli"; font-size: 14px; line-height: 20px; background-color: #FFFFFF; diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss index c315a61d8..1abf116a6 100644 --- a/app/assets/stylesheets/fonts.scss +++ b/app/assets/stylesheets/fonts.scss @@ -1,23 +1,14 @@ @font-face { - font-family: "Muli"; - src: asset-url("Muli-Regular.woff2") format("woff2"), - asset-url("Muli-Regular.woff") format("woff"); + font-family: "Marianne"; + src: asset-url("Marianne-Regular.woff2") format("woff2"), + asset-url("Marianne-Regular.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: "Muli"; - src: asset-url("Muli-Bold.woff2") format("woff2"), - asset-url("Muli-Bold.woff") format("woff"); + font-family: "Spectrale"; + src: asset-url("Spectral-Regular.ttf") format("ttf"); font-weight: bold; font-style: normal; } - -@font-face { - font-family: "Muli"; - src: asset-url("Muli-Italic.woff2") format("woff2"), - asset-url("Muli-Italic.woff") format("woff"); - font-weight: normal; - font-style: italic; -} diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss index 124e9ee2a..4b1e27129 100644 --- a/app/assets/stylesheets/landing.scss +++ b/app/assets/stylesheets/landing.scss @@ -295,6 +295,7 @@ $users-breakpoint: 950px; font-size: 24px; font-weight: bold; margin-top: 13px; + color: #FFFFFF; &.grey { color: $g700; diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 4c0e9749c..b52db86d1 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -17,7 +17,7 @@ } body { - font-family: "Muli"; + font-family: "Marianne"; } .subtitle { diff --git a/app/assets/stylesheets/procedure_champs_editor.scss b/app/assets/stylesheets/procedure_champs_editor.scss index 2efafa2f1..e6ed9e8d1 100644 --- a/app/assets/stylesheets/procedure_champs_editor.scss +++ b/app/assets/stylesheets/procedure_champs_editor.scss @@ -46,7 +46,6 @@ padding-bottom: 5px; border-radius: 5px; border: 1px solid $border-grey; - font-family: "Muli"; background-color: #FFFFFF; color: $black; text-align: center; diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js index f7d7410ea..208d2bfb3 100644 --- a/app/javascript/entrypoints/application.js +++ b/app/javascript/entrypoints/application.js @@ -67,3 +67,5 @@ window.DS = window.DS || DS; import('../shared/track/matomo'); import('../shared/track/sentry'); + +import "../../../node_modules/@gouvfr/dsfr/dist/dsfr.min.css"; diff --git a/app/javascript/entrypoints/dsfr-module.js b/app/javascript/entrypoints/dsfr-module.js new file mode 100644 index 000000000..0ca6db5ae --- /dev/null +++ b/app/javascript/entrypoints/dsfr-module.js @@ -0,0 +1 @@ +import '../../../node_modules/@gouvfr/dsfr/dist/dsfr.module.js';; diff --git a/app/javascript/entrypoints/dsfr-nomodule.js b/app/javascript/entrypoints/dsfr-nomodule.js new file mode 100644 index 000000000..c52a4d0c7 --- /dev/null +++ b/app/javascript/entrypoints/dsfr-nomodule.js @@ -0,0 +1 @@ +import '../../../node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.min.js'; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 86949938b..5234da84d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,6 +18,8 @@ = vite_client_tag = vite_react_refresh_tag = vite_javascript_tag 'application' + = vite_javascript_tag 'dsfr-module', type: "module", nonce: true + = vite_javascript_tag 'dsfr-nomodule', type: 'nomodule', type: "text/javascript", nonce: true - if administrateur_signed_in? = vite_javascript_tag 'track-admin' @@ -28,8 +30,8 @@ = vite_legacy_javascript_tag 'track-admin' = vite_legacy_fallback_tag - = preload_link_tag(asset_url("Muli-Regular.woff2")) - = preload_link_tag(asset_url("Muli-Bold.woff2")) + = preload_link_tag(asset_url("Marianne-Regular.woff2")) + = preload_link_tag(asset_url("Spectral-Regular.ttf")) = stylesheet_link_tag 'application', media: 'all' = vite_stylesheet_tag 'application', media: 'all'