Merge branch 'staging'

2017-01-03 14:54:20 +01:00 · 2017-01-03 14:54:20 +01:00 · e8b4651529
commit e8b4651529
parent 5362051942 aa5349e8b4
5 changed files with 12 additions and 9 deletions
--- a/app/assets/stylesheets/landing.scss
+++ b/app/assets/stylesheets/landing.scss
@ -1,3 +1,7 @@
+#logo-tps {
+  width: 200px;
+}
+
 #landing {
  background-image: image-url('landing_background.png');
  background-attachment: fixed;
@ -13,10 +17,6 @@
    width: 150px;
  }

-  #logo-tps {
-    width: 200px;
-  }
-
  #title {
    padding-bottom: 2%;
    padding-top: 1%;
--- a/app/views/users/passwords/edit.html.haml
+++ b/app/views/users/passwords/edit.html.haml
@ -29,6 +29,7 @@
 = devise_error_messages!

 #form_login
+  .flag
    = image_tag(image_url(LOGO_NAME))
  %br
  %h2#gestionnaire_login Changement de mot de passe
--- a/app/views/users/passwords/new.html.haml
+++ b/app/views/users/passwords/new.html.haml
@ -30,6 +30,7 @@

 %br
 #form_login
+  .flag
    = image_tag(image_url(LOGO_NAME))
  %br
  %h2#gestionnaire_login Mot de passe oublié
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@ -30,6 +30,7 @@

 #form_login
  %br
+  .flag
    = image_tag(image_url(LOGO_NAME))
  %br
  %h2#gestionnaire_login Inscription
--- a/app/views/users/siret/_pro.html.haml
+++ b/app/views/users/siret/_pro.html.haml
@ -1,5 +1,5 @@
 %p.lead{id: 'pro_section'}
-
+  .flag
    = image_tag(image_url(LOGO_NAME))
  %br
  %h2#titre_procedure.text-info