From 64be46929b61c897860ca72bf515d4e2ca3b3b53 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 24 Oct 2022 17:57:08 +0200
Subject: [PATCH] nice devise
---
app/assets/stylesheets/extranet/layout/_footer.sass | 7 +++++++
.../stylesheets/extranet/layout/_typography.sass | 2 +-
app/assets/stylesheets/extranet/pages/_devise.sass | 8 ++++----
app/views/extranet/layouts/devise.html.erb | 10 ++++++++--
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/app/assets/stylesheets/extranet/layout/_footer.sass b/app/assets/stylesheets/extranet/layout/_footer.sass
index 7090ab37c..177f77af4 100644
--- a/app/assets/stylesheets/extranet/layout/_footer.sass
+++ b/app/assets/stylesheets/extranet/layout/_footer.sass
@@ -11,4 +11,11 @@ footer
a
display: block
line-height: px2rem(26)
+ padding-bottom: 15px
text-decoration: underline
+ text-decoration-thickness: 1px
+ text-underline-offset: 3px
+ text-decoration-color: #00000033
+ transition: text-decoration 0.5s, color 0.5s
+ &:hover
+ text-decoration-color: #000000
\ No newline at end of file
diff --git a/app/assets/stylesheets/extranet/layout/_typography.sass b/app/assets/stylesheets/extranet/layout/_typography.sass
index f00c87184..bfffe7a54 100644
--- a/app/assets/stylesheets/extranet/layout/_typography.sass
+++ b/app/assets/stylesheets/extranet/layout/_typography.sass
@@ -36,4 +36,4 @@ h1
text-decoration-color: adjust-color($active-color, $alpha: -0.5)
&:hover
color: darken($active-color, 10)
- text-decoration-color: $active-color
\ No newline at end of file
+ text-decoration-color: $active-color
diff --git a/app/assets/stylesheets/extranet/pages/_devise.sass b/app/assets/stylesheets/extranet/pages/_devise.sass
index ae3106dc1..1912649d4 100644
--- a/app/assets/stylesheets/extranet/pages/_devise.sass
+++ b/app/assets/stylesheets/extranet/pages/_devise.sass
@@ -2,8 +2,8 @@
background-color: $header-color
.logo
max-width: 150px
- margin: 60px 0
- main
- margin-bottom: 200px
+ margin: 120px 0
footer
- border-top: 1px solid $light-border-color
\ No newline at end of file
+ margin-top: 100px
+ border-top: 1px solid $light-border-color
+ padding-bottom: 0
\ No newline at end of file
diff --git a/app/views/extranet/layouts/devise.html.erb b/app/views/extranet/layouts/devise.html.erb
index b0db1d462..26271328d 100644
--- a/app/views/extranet/layouts/devise.html.erb
+++ b/app/views/extranet/layouts/devise.html.erb
@@ -7,7 +7,7 @@
<main class="container">
<div class="row">
<div class="offset-md-2 col-md-8">
- <h1 class="my-5 py-5 text-center">
+ <h1 class="text-center">
<%= link_to root_path do %>
<%= render 'logo' %>
<% end %>
@@ -19,10 +19,16 @@
<div class="alert alert-danger mt-2" role="alert"><%= alert.html_safe %></div>
<% end %>
<%= yield %>
+ <footer>
+ <nav class="d-md-flex justify-content-between py-4">
+ <%= link_to t('terms_of_service'), t('terms_of_service_url'), target: '_blank', rel: 'noreferrer' %>
+ <%= link_to t('privacy_policy'), t('privacy_policy_url'), target: '_blank', rel: 'noreferrer' %>
+ <%= link_to t('cookies_policy'), t('cookies_policy_url'), target: '_blank', rel: 'noreferrer' %>
+ <%= link_to t('cookies_consent_choice'), '', class: 'js-gdpr__cookie_consent__display_again' %>
+ </footer>
</div>
</div>
</main>
- <%= render 'extranet/application/footer', hide_logo: true %>
<%= render 'gdpr/cookie_consent' %>
<%= render 'bugsnag' %>
</body>
--
GitLab