diff --git a/app/assets/stylesheets/admin.sass b/app/assets/stylesheets/admin.sass index eac54bc360073809d52ff5ae788b771d82b6aedf..9a243d739ed6b82bee2aaa253cd886a04c095245 100644 --- a/app/assets/stylesheets/admin.sass +++ b/app/assets/stylesheets/admin.sass @@ -1,3 +1,4 @@ @import 'appstack/light' @import 'simple_form_password_with_hints' +@import 'commons/*' @import 'admin/*' diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 27474b5d81f82f89fc5c67af09b5b7241062c228..7a34d970b827cd180c92a73f7ea223b45eaed9bd 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -1,4 +1,5 @@ @import 'bootstrap' @import 'appstack/light' @import 'simple_form_password_with_hints' +@import 'commons/*' @import 'application/*' diff --git a/app/assets/stylesheets/commons/_forms.sass b/app/assets/stylesheets/commons/_forms.sass new file mode 100644 index 0000000000000000000000000000000000000000..082da47e49878b719ad443896771cf24ccfc9422 --- /dev/null +++ b/app/assets/stylesheets/commons/_forms.sass @@ -0,0 +1,4 @@ +.password + position: relative +.sfpwh-password-toggle + top: calc(50% - 6px) diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 81240b56237ff8a787c2725db8492b9a9a7057b9..d261dd729ebd2680dd172df8b32830b200a6a5eb 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,4 +1,4 @@ -<h2><%= t(".forgot_your_password") %></h2> +<h2 class="text-center"><%= t(".forgot_your_password") %></h2> <%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= f.error_notification %> diff --git a/config/storage.yml b/config/storage.yml index 33f0fab246a7c24e1d782ac0643bd1c2a45ee7a7..cfa1ad6556f11204ff2316451d7f42e5c62a5801 100644 --- a/config/storage.yml +++ b/config/storage.yml @@ -20,6 +20,14 @@ outscale: region: <%= ENV['OUTSCALE_OOS_REGION'] %> bucket: <%= ENV['OUTSCALE_OOS_BUCKET'] %> +scaleway: + service: S3 + access_key_id: <%= ENV['SCALEWAY_OS_ACCESS_KEY_ID'] %> + secret_access_key: <%= ENV['SCALEWAY_OS_SECRET_ACCESS_KEY'] %> + region: <%= ENV['SCALEWAY_OS_REGION'] %> + bucket: <%= ENV['SCALEWAY_OS_BUCKET'] %> + endpoint: <%= ENV['SCALEWAY_OS_ENDPOINT'] %> + # Remember not to checkin your GCS keyfile to a repository # google: # service: GCS