diff --git a/app/assets/images/marianne.svg b/app/assets/images/marianne.svg index 8ed835709..9690583ea 100644 --- a/app/assets/images/marianne.svg +++ b/app/assets/images/marianne.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/republique-francaise-logo.svg b/app/assets/images/republique-francaise-logo.svg new file mode 100644 index 000000000..0f1cd3d4c --- /dev/null +++ b/app/assets/images/republique-francaise-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/left_panel.scss b/app/assets/stylesheets/left_panel.scss index e35b6494f..99898800f 100644 --- a/app/assets/stylesheets/left_panel.scss +++ b/app/assets/stylesheets/left_panel.scss @@ -81,6 +81,10 @@ margin: 5px auto 0 20px; width: 150px; } + + img { + background-color: #FFFFFF; + } } #action-block { diff --git a/app/assets/stylesheets/new_design/new_footer.scss b/app/assets/stylesheets/new_design/new_footer.scss index 1c39e723d..c64c24d50 100644 --- a/app/assets/stylesheets/new_design/new_footer.scss +++ b/app/assets/stylesheets/new_design/new_footer.scss @@ -84,6 +84,13 @@ footer { height: 25px; } +.footer-logo-france { + @include ie-compatible-background-image("republique-francaise-logo.svg"); + + width: 105px; + height: 90px; +} + .footer-link a, .footer-text a { color: $black; diff --git a/app/models/procedure.rb b/app/models/procedure.rb index e42bb4954..5da6426ad 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -506,7 +506,7 @@ class Procedure < ApplicationRecord if logo.attached? Rails.application.routes.url_helpers.url_for(logo) else - ActionController::Base.helpers.image_url("marianne.svg") + ActionController::Base.helpers.image_url("republique-francaise-logo.svg") end end diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index aba320f21..7967eca97 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -14,12 +14,13 @@ %header.new-header{ class: current_page?(root_path) ? nil : "new-header-with-border", role: 'banner' } .header-inner-content - .flex.align-center + .flex.align-center.justify-center - if params[:controller] == 'users/commencer' = link_to 'Revenir en arrière', url_for(:back), class: "button", title: "Revenir sur le site de mon administration" - else - = link_to root_path_for_profile(nav_bar_profile), class: 'header-logo', title: "Aller à la page d'accueil de demarches-simplifiees.fr" do - = image_tag 'marianne.svg', alt: '', width: 65 + = link_to root_path_for_profile(nav_bar_profile), class: 'header-logo justify-center', title: "Aller à la page d'accueil de demarches-simplifiees.fr" do + = image_tag 'marianne.svg', alt: 'Liberté, égalité, fraternité', width: '65px' + = link_to root_path_for_profile(nav_bar_profile), class: 'header-logo justify-center', title: "Aller à la page d'accueil de demarches-simplifiees.fr" do %span.big.site-title> demarches-simplifiees.fr %span.small.site-title> d-s.fr diff --git a/app/views/root/_footer.html.haml b/app/views/root/_footer.html.haml index 038e565a6..6e41eb4aa 100644 --- a/app/views/root/_footer.html.haml +++ b/app/views/root/_footer.html.haml @@ -15,6 +15,7 @@ %span.footer-logo.footer-logo-dinum{ role: 'img', 'aria-label': 'DINUM' } = link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr" do %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'beta.gouv.fr' } + %span.footer-logo.footer-logo-france{ role: 'img', 'aria-label': 'République Française' } %li.footer-column %ul.footer-links