From ed04e02110fdc0f64419b556221585dec6cc6beb Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Tue, 12 Oct 2021 10:38:56 +0200
Subject: [PATCH] login
---
app/assets/stylesheets/admin.sass | 1 +
app/assets/stylesheets/application.sass | 1 +
app/assets/stylesheets/commons/_forms.sass | 4 ++++
app/views/devise/passwords/new.html.erb | 2 +-
config/storage.yml | 8 ++++++++
5 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 app/assets/stylesheets/commons/_forms.sass
diff --git a/app/assets/stylesheets/admin.sass b/app/assets/stylesheets/admin.sass
index eac54bc36..9a243d739 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 27474b5d8..7a34d970b 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 000000000..082da47e4
--- /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 81240b562..d261dd729 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 33f0fab24..cfa1ad655 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
--
GitLab