diff options
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | app/assets/images/welcome.jpg | bin | 0 -> 161221 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/application.css.scss.erb | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/modules/devise.css.scss | 4 | ||||
| -rw-r--r-- | app/views/devise/sessions/new.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/devise.fr.yml | 2 |
6 files changed, 10 insertions, 4 deletions
@@ -187,3 +187,8 @@ Support ------- Users looking for support should file an issue on the GitHub [issue tracking page](../../issues), or file a [pull request](../../pulls) if you have a fix available. + +Credits +------- + +Thanks to Ingolf for his [photo](https://www.flickr.com/photos/ingolfbln/7663851694) under CC BY-SA 2.0 license
\ No newline at end of file diff --git a/app/assets/images/welcome.jpg b/app/assets/images/welcome.jpg Binary files differnew file mode 100644 index 000000000..3fe50d97b --- /dev/null +++ b/app/assets/images/welcome.jpg diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index b510fc524..31fa15758 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -5,6 +5,7 @@ $navbar-default-link-color: white; $body-bg: #eee; // Then bootstrap itself +@import "bootstrap-sass-official/_bootstrap-sprockets.scss"; @import "bootstrap-sass-official"; // Whatever application styles you have go last diff --git a/app/assets/stylesheets/modules/devise.css.scss b/app/assets/stylesheets/modules/devise.css.scss index 83b2b3fec..8236366ce 100644 --- a/app/assets/stylesheets/modules/devise.css.scss +++ b/app/assets/stylesheets/modules/devise.css.scss @@ -2,8 +2,8 @@ background-color: $gray-light; .front_bg{ - //background: url(image-path('intro.jpg')) no-repeat center center; - //background-size: cover; + background: url(image-path('welcome.jpg')) no-repeat center center; + background-size: cover; #devise_middle{ min-height: 620px; diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 768efdd9f..dc06a3ea2 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -54,7 +54,7 @@ <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %> <%= form.input :password_confirmation, :as => :password, :label => false, :placeholder => t("helpers.label.user.password_confirmation"), input_html: { :class => "form-control" } %> - <%= form.button :submit, :class => "btn-default" %> + <%= form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info" %> <% end %> </div> </div> diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index 391ec343a..cb45578e5 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -16,7 +16,7 @@ fr: registrations: new: title: "Inscrivez vous" - commit: Créer un compte + commit: "S'inscrire" edit: title: "Votre Profil" commit: Modifier |
