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

Merge pull request #4942 from betagouv/4935-update-logo

Browse source 
Mise à jour des logos, pour conformité avec la Charte Graphique de l’État
This commit is contained in:
Pierre de La Morinerie 2020-05-14 17:07:28 +02:00 • committed by GitHub
commit e3f4547841
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/images/marianne.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

1
app/assets/images/republique-francaise-logo.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

4
app/assets/stylesheets/left_panel.scss
View file

@ -81,6 +81,10 @@
margin: 5px auto 0 20px;
width: 150px;
}
img {
background-color: #FFFFFF;
}
}
#action-block {

7
app/assets/stylesheets/new_design/new_footer.scss
View file

@ -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;

2
app/models/procedure.rb
View file

@ -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

7
app/views/layouts/_new_header.haml
View file

@ -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

1
app/views/root/_footer.html.haml
View file

@ -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