DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

feat(DesignSysteme): add DSfr and switch to Marianne font

Browse source
This commit is contained in:
Martin 2022-08-17 11:13:10 +02:00
parent 5f2b290407
commit 1bdbf2a7d7
19 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/fonts/Marianne-Regular.woff Normal file
View file

Binary file not shown.

BIN
app/assets/fonts/Marianne-Regular.woff2 Normal file
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Bold.woff
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Bold.woff2
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Italic.woff
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Italic.woff2
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Regular.woff
View file

Binary file not shown.

BIN
app/assets/fonts/Muli-Regular.woff2
View file

Binary file not shown.

BIN
app/assets/fonts/Spectral-Regular.ttf Normal file
View file

Binary file not shown.

2
app/assets/stylesheets/_typography.scss
View file

@ -1,7 +1,7 @@
@import "colors"; @import "colors";
%new-type { %new-type {
font-family: "Muli", system-ui, -apple-system, sans-serif; font-family: "Marianne", system-ui, -apple-system, sans-serif;
color: $black; color: $black;
} }

1
app/assets/stylesheets/buttons.scss
View file

@ -9,7 +9,6 @@
padding: 8px 16px; padding: 8px 16px;
border-radius: 30px; border-radius: 30px;
border: 1px solid $border-grey; border: 1px solid $border-grey;
font-family: "Muli";
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
background-color: #FFFFFF; background-color: #FFFFFF;

19
app/assets/stylesheets/fonts.scss
View file

@ -1,23 +1,14 @@
@font-face { @font-face {
font-family: "Muli"; font-family: "Marianne";
src: asset-url("Muli-Regular.woff2") format("woff2"), src: asset-url("Marianne-Regular.woff2") format("woff2"),
asset-url("Muli-Regular.woff") format("woff"); asset-url("Marianne-Regular.woff") format("woff");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Muli"; font-family: "Spectrale";
src: asset-url("Muli-Bold.woff2") format("woff2"), src: asset-url("Spectral-Regular.ttf") format("ttf");
asset-url("Muli-Bold.woff") format("woff");
font-weight: bold; font-weight: bold;
font-style: normal; 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;
}

1
app/assets/stylesheets/landing.scss
View file

@ -295,6 +295,7 @@ $users-breakpoint: 950px;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
margin-top: 13px; margin-top: 13px;
color: #FFFFFF;
&.grey { &.grey {
color: $g700; color: $g700;

2
app/assets/stylesheets/print.scss
View file

@ -17,7 +17,7 @@
} }
body { body {
font-family: "Muli"; font-family: "Marianne";
} }
.subtitle { .subtitle {

1
app/assets/stylesheets/procedure_champs_editor.scss
View file

@ -46,7 +46,6 @@
padding-bottom: 5px; padding-bottom: 5px;
border-radius: 5px; border-radius: 5px;
border: 1px solid $border-grey; border: 1px solid $border-grey;
font-family: "Muli";
background-color: #FFFFFF; background-color: #FFFFFF;
color: $black; color: $black;
text-align: center; text-align: center;

2
app/javascript/entrypoints/application.js
View file

@ -67,3 +67,5 @@ window.DS = window.DS || DS;
import('../shared/track/matomo'); import('../shared/track/matomo');
import('../shared/track/sentry'); import('../shared/track/sentry');
import "../../../node_modules/@gouvfr/dsfr/dist/dsfr.min.css";

1
app/javascript/entrypoints/dsfr-module.js Normal file
View file

@ -0,0 +1 @@
import '../../../node_modules/@gouvfr/dsfr/dist/dsfr.module.js';;

1
app/javascript/entrypoints/dsfr-nomodule.js Normal file
View file

@ -0,0 +1 @@
import '../../../node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.min.js';

6
app/views/layouts/application.html.haml
View file

@ -18,6 +18,8 @@
= vite_client_tag = vite_client_tag
= vite_react_refresh_tag = vite_react_refresh_tag
= vite_javascript_tag 'application' = 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? - if administrateur_signed_in?
= vite_javascript_tag 'track-admin' = vite_javascript_tag 'track-admin'
@ -28,8 +30,8 @@
= vite_legacy_javascript_tag 'track-admin' = vite_legacy_javascript_tag 'track-admin'
= vite_legacy_fallback_tag = vite_legacy_fallback_tag
= preload_link_tag(asset_url("Muli-Regular.woff2")) = preload_link_tag(asset_url("Marianne-Regular.woff2"))
= preload_link_tag(asset_url("Muli-Bold.woff2")) = preload_link_tag(asset_url("Spectral-Regular.ttf"))
= stylesheet_link_tag 'application', media: 'all' = stylesheet_link_tag 'application', media: 'all'
= vite_stylesheet_tag 'application', media: 'all' = vite_stylesheet_tag 'application', media: 'all'