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

Merge pull request #1504 from betagouv/sig

Browse source 
Sig
This commit is contained in:
gregoirenovel 2018-02-28 18:13:49 +01:00 • committed by GitHub
commit 0edc328155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

@ -11,3 +11,10 @@
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face {
font-family: "Muli";
src: asset-url("Muli-Italic.woff") format("woff");
font-weight: normal;
font-style: italic;
}

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

@ -44,26 +44,32 @@ footer {
} }
} }
.footer-logo:hover { .footer-text {
opacity: 0.8; font-style: italic;
margin-bottom: 14px;
} }
.footer-logo-beta-gouv-fr { .footer-logo:hover {
@include ie-compatible-background-image("footer/logo-beta-gouv-fr.svg"); opacity: 0.8;
width: 190px;
height: 32px;
margin-bottom: 14px;
} }
.footer-logo-dinsic { .footer-logo-dinsic {
@include ie-compatible-background-image("footer/logo-dinsic.svg"); @include ie-compatible-background-image("footer/logo-dinsic.svg");
height: 115px; height: 104px;
width: 100px; width: 90px;
margin-bottom: 14px;
} }
.footer-link a { .footer-logo-beta-gouv-fr {
@include ie-compatible-background-image("footer/logo-beta-gouv-fr.svg");
width: 150px;
height: 25px;
}
.footer-link a,
.footer-text a {
color: $black; color: $black;
text-decoration: none; text-decoration: none;

12
app/views/layouts/_new_footer.html.haml
View file

@ -3,15 +3,15 @@
%ul.footer-columns %ul.footer-columns
%li.footer-column %li.footer-column
%ul.footer-logos %ul.footer-logos
%li.footer-link %li.footer-text
Un service fourni par : Un service fourni par la <a href="http://www.modernisation.gouv.fr/">DINSIC</a>
%li %br
= link_to "https://beta.gouv.fr/" do et incubé par <a href="https://beta.gouv.fr">beta.gouv.fr</a>
%span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'Logo de beta.gouv.fr' }
%li %li
= link_to "http://www.modernisation.gouv.fr/" do = link_to "http://www.modernisation.gouv.fr/" do
%span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'Logo de la DINSIC' } %span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'Logo de la DINSIC' }
= link_to "https://beta.gouv.fr" do
%span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'Logo de beta.gouv.fr' }
%li.footer-column %li.footer-column
%ul.footer-links %ul.footer-links