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

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2017-01-03 14:54:06 +01:00
commit aa5349e8b4
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,7 @@
#logo-tps {
width: 200px;
}
#landing { #landing {
background-image: image-url('landing_background.png'); background-image: image-url('landing_background.png');
background-attachment: fixed; background-attachment: fixed;
@ -13,10 +17,6 @@
width: 150px; width: 150px;
} }
#logo-tps {
width: 200px;
}
#title { #title {
padding-bottom: 2%; padding-bottom: 2%;
padding-top: 1%; padding-top: 1%;

1
app/views/users/passwords/edit.html.haml
View file

@ -29,6 +29,7 @@
= devise_error_messages! = devise_error_messages!
#form_login #form_login
.flag
= image_tag(image_url(LOGO_NAME)) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Changement de mot de passe %h2#gestionnaire_login Changement de mot de passe

1
app/views/users/passwords/new.html.haml
View file

@ -30,6 +30,7 @@
%br %br
#form_login #form_login
.flag
= image_tag(image_url(LOGO_NAME)) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Mot de passe oublié %h2#gestionnaire_login Mot de passe oublié

1
app/views/users/registrations/new.html.haml
View file

@ -30,6 +30,7 @@
#form_login #form_login
%br %br
.flag
= image_tag(image_url(LOGO_NAME)) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Inscription %h2#gestionnaire_login Inscription

2
app/views/users/siret/_pro.html.haml
View file

@ -1,5 +1,5 @@
%p.lead{id: 'pro_section'} %p.lead{id: 'pro_section'}
.flag
= image_tag(image_url(LOGO_NAME)) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#titre_procedure.text-info %h2#titre_procedure.text-info