diff --git a/app/assets/fonts/Muli-Bold.woff b/app/assets/fonts/Muli-Bold.woff index fc7a6fa82..32cd7c7b9 100644 Binary files a/app/assets/fonts/Muli-Bold.woff and b/app/assets/fonts/Muli-Bold.woff differ diff --git a/app/assets/fonts/Muli-Bold.woff2 b/app/assets/fonts/Muli-Bold.woff2 new file mode 100644 index 000000000..238cad90c Binary files /dev/null and b/app/assets/fonts/Muli-Bold.woff2 differ diff --git a/app/assets/fonts/Muli-Italic.woff b/app/assets/fonts/Muli-Italic.woff index 9358d8ea3..9780f52c7 100644 Binary files a/app/assets/fonts/Muli-Italic.woff and b/app/assets/fonts/Muli-Italic.woff differ diff --git a/app/assets/fonts/Muli-Italic.woff2 b/app/assets/fonts/Muli-Italic.woff2 new file mode 100644 index 000000000..13b30a7e1 Binary files /dev/null and b/app/assets/fonts/Muli-Italic.woff2 differ diff --git a/app/assets/fonts/Muli-Regular.woff b/app/assets/fonts/Muli-Regular.woff index f61ecf832..061938363 100644 Binary files a/app/assets/fonts/Muli-Regular.woff and b/app/assets/fonts/Muli-Regular.woff differ diff --git a/app/assets/fonts/Muli-Regular.woff2 b/app/assets/fonts/Muli-Regular.woff2 new file mode 100644 index 000000000..aabeed2ca Binary files /dev/null and b/app/assets/fonts/Muli-Regular.woff2 differ diff --git a/app/assets/images/footer/logo-dinum.png b/app/assets/images/footer/logo-dinum.png new file mode 100644 index 000000000..86c7d6902 Binary files /dev/null and b/app/assets/images/footer/logo-dinum.png differ diff --git a/app/assets/images/footer/logo-dinum.svg b/app/assets/images/footer/logo-dinum.svg deleted file mode 100644 index 096f4714b..000000000 --- a/app/assets/images/footer/logo-dinum.svg +++ /dev/null @@ -1 +0,0 @@ -BM_DINUM diff --git a/app/assets/images/marianne.png b/app/assets/images/marianne.png new file mode 100644 index 000000000..a84a7bc79 Binary files /dev/null and b/app/assets/images/marianne.png differ diff --git a/app/assets/stylesheets/new_design/fonts.scss b/app/assets/stylesheets/new_design/fonts.scss index 2e093a609..c315a61d8 100644 --- a/app/assets/stylesheets/new_design/fonts.scss +++ b/app/assets/stylesheets/new_design/fonts.scss @@ -1,20 +1,23 @@ @font-face { font-family: "Muli"; - src: asset-url("Muli-Regular.woff") format("woff"); + src: asset-url("Muli-Regular.woff2") format("woff2"), + asset-url("Muli-Regular.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { font-family: "Muli"; - src: asset-url("Muli-Bold.woff") format("woff"); + src: asset-url("Muli-Bold.woff2") format("woff2"), + asset-url("Muli-Bold.woff") format("woff"); font-weight: bold; font-style: normal; } @font-face { font-family: "Muli"; - src: asset-url("Muli-Italic.woff") format("woff"); + 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/new_design/new_footer.scss b/app/assets/stylesheets/new_design/new_footer.scss index c64c24d50..ee726a9ef 100644 --- a/app/assets/stylesheets/new_design/new_footer.scss +++ b/app/assets/stylesheets/new_design/new_footer.scss @@ -61,7 +61,6 @@ footer { } .footer-text { - font-style: italic; margin-bottom: 14px; } @@ -70,10 +69,10 @@ footer { } .footer-logo-dinum { - @include ie-compatible-background-image("footer/logo-dinum.svg"); + @include ie-compatible-background-image("footer/logo-dinum.png"); - height: 104px; - width: 90px; + height: 150px; + width: 202px; margin-bottom: 14px; } diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 857aecffb..8bba0a619 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -20,7 +20,7 @@ - else - root_profile_link, root_profile_libelle = root_path_info_for_profile(nav_bar_profile) = link_to root_profile_link, class: 'header-logo justify-center', title: root_profile_libelle do - = image_tag 'marianne.svg', alt: 'Liberté, égalité, fraternité', width: '65' + = image_tag 'marianne.png', alt: 'Liberté, égalité, fraternité', width: '65', height: 56, loading: 'lazy' %span.big.site-title> = APPLICATION_NAME %span.small.site-title> diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 65e4c51e9..8383106fe 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -16,9 +16,8 @@ - packs = ['application', 'track', administrateur_signed_in? ? 'track-admin' : nil].compact = javascript_packs_with_chunks_tag *packs, defer: true - = preload_link_tag(asset_url("Muli-Regular.woff")) - = preload_link_tag(asset_url("Muli-Bold.woff")) - = preload_link_tag(asset_url("Muli-Italic.woff")) + = preload_link_tag(asset_url("Muli-Regular.woff2")) + = preload_link_tag(asset_url("Muli-Bold.woff2")) = stylesheet_link_tag 'new_design/new_application', media: 'all' = stylesheet_link_tag 'new_design/print', media: 'print' diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 85568cee2..9aa9b3719 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -14,13 +14,13 @@ %em.hero-tagline-em en ligne .hero-illustration - %img{ :src => image_url("landing/hero/dematerialiser.svg"), alt: '' } + %img{ :src => image_url("landing/hero/dematerialiser.svg"), alt: '', width: 499, height: 280, loading: 'lazy' } .landing-panel.usagers-panel .container .role-panel-wrapper .role-panel-30.role-usagers-image - %img.role-image{ :src => image_url("landing/roles/usagers.svg"), alt: '' } + %img.role-image{ :src => image_url("landing/roles/usagers.svg"), alt: '', width: 176, height: 180, loading: 'lazy' } .role-panel-70 %h2.role-panel-title Vous souhaitez effectuer une demande auprès d'une administration ?