From 182d6faa7ef6ff6b54fc6abfc9b81fad1920b302 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 6 Apr 2023 14:06:34 +0200
Subject: [PATCH] Issue #991
---
app/assets/stylesheets/admin/pure/grid.sass | 2 +-
.../osuny/simple_navigation_renderer.rb | 2 +-
.../admin/layouts/themes/pure/_nav.html.erb | 2 +-
app/views/application/_footer.html.erb | 16 +++++-----
app/views/devise/registrations/edit.html.erb | 8 ++---
app/views/devise/registrations/new.html.erb | 4 +--
.../two_factor_authentication/show.html.erb | 16 ++++++----
app/views/layouts/devise.html.erb | 32 +++++++------------
8 files changed, 37 insertions(+), 45 deletions(-)
diff --git a/app/assets/stylesheets/admin/pure/grid.sass b/app/assets/stylesheets/admin/pure/grid.sass
index ff028e0fa..ffdb47b85 100644
--- a/app/assets/stylesheets/admin/pure/grid.sass
+++ b/app/assets/stylesheets/admin/pure/grid.sass
@@ -1,4 +1,4 @@
*
--bs-gutter-x: 64px !important
@media (max-width: 768px)
- --bs-gutter-x: 20px !important
+ --bs-gutter-x: 32px !important
diff --git a/app/services/osuny/simple_navigation_renderer.rb b/app/services/osuny/simple_navigation_renderer.rb
index b6857b68e..b1dcd9275 100644
--- a/app/services/osuny/simple_navigation_renderer.rb
+++ b/app/services/osuny/simple_navigation_renderer.rb
@@ -1,5 +1,5 @@
class Osuny::SimpleNavigationRenderer < SimpleNavigation::Renderer::Base
- OPEN = "<div class=\"col-md-4 col-lg-3 mb-5\">"
+ OPEN = "<div class=\"col-sm-6 col-md-4 col-lg-3 mb-5\">"
CLOSE = "</div>"
attr_accessor :content, :index, :item
diff --git a/app/views/admin/layouts/themes/pure/_nav.html.erb b/app/views/admin/layouts/themes/pure/_nav.html.erb
index 4e18def30..5c34176be 100644
--- a/app/views/admin/layouts/themes/pure/_nav.html.erb
+++ b/app/views/admin/layouts/themes/pure/_nav.html.erb
@@ -42,7 +42,7 @@ context ||= :admin
<div class="container-fluid">
<div class="row">
<%= render_navigation context: context, renderer: Osuny::SimpleNavigationRenderer %>
- <div class="col-md-4 col-lg-3">
+ <div class="col-sm-6 col-md-4 col-lg-3">
<%
if current_user.picture.attached? && current_user.picture.variable?
image = current_user.picture.variant(resize: '200x200')
diff --git a/app/views/application/_footer.html.erb b/app/views/application/_footer.html.erb
index 530f5a966..a6f9f3b22 100644
--- a/app/views/application/_footer.html.erb
+++ b/app/views/application/_footer.html.erb
@@ -1,27 +1,27 @@
-<footer class="pt-5">
- <div class="container text-center">
- <div class="mb-5">
+<footer class="mt-5 pt-5">
+ <div class="container">
+ <div class="mb-5 text-lg-center">
<%= image_tag 'osuny-black.svg', width: 80 %>
</div>
- <nav class="nav justify-content-center">
+ <nav class="nav small d-block d-lg-flex justify-content-lg-center">
<%= link_to t('terms_of_service'),
t('terms_of_service_url'),
- class: 'nav-link',
+ class: 'nav-link ps-0',
target: '_blank',
rel: 'noreferrer' %>
<%= link_to t('privacy_policy'),
t('privacy_policy_url'),
- class: 'nav-link',
+ class: 'nav-link ps-0',
target: '_blank',
rel: 'noreferrer' %>
<%= link_to t('cookies_policy'),
t('cookies_policy_url'),
- class: 'nav-link',
+ class: 'nav-link ps-0',
target: '_blank',
rel: 'noreferrer' %>
<%= link_to t('cookies_consent_choice'),
'',
- class: 'nav-link js-gdpr__cookie_consent__display_again' %>
+ class: 'nav-link js-gdpr__cookie_consent__display_again ps-0' %>
</nav>
</div>
</footer>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 08194d186..5bb6d917b 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -4,7 +4,7 @@
<%= f.error_notification %>
<div class="row">
- <div class="col-md-4">
+ <div class="col-lg-6">
<%= f.input :email, required: true %>
<%= f.input :first_name,
required: true,
@@ -13,15 +13,12 @@
<%= f.input :last_name,
required: true,
input_html: { autocomplete: "last_name" } %>
- </div>
- <div class="col-md-4">
<%= f.association :language,
include_blank: false,
label_method: lambda { |l| t("languages.#{l.iso_code.to_s}") } %>
- <%= f.input :mobile_phone %>
<%= f.input :admin_theme, include_blank: false %>
</div>
- <div class="col-md-4">
+ <div class="col-lg-6">
<%= f.input :password,
as: :password_with_hints,
allow_password_uncloaking: true,
@@ -35,6 +32,7 @@
hint: t(".leave_blank_if_you_don_t_want_to_change_it"),
required: false,
input_html: { autocomplete: "new-password" } %>
+ <%= f.input :mobile_phone %>
<%= f.input :picture,
as: :single_deletable_file,
input_html: { accept: '.jpg,.jpeg,.png,.svg' },
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 34db524df..cc85287f0 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -6,7 +6,7 @@
<%= f.error_notification %>
<div class="row">
- <div class="col-md-6">
+ <div class="col-lg-6">
<%= f.input :email,
required: true,
input_html: { autocomplete: "email" } %>
@@ -22,7 +22,7 @@
label_method: lambda { |l| t("languages.#{l.iso_code.to_s}") },
include_blank: :translate %>
</div>
- <div class="col-md-6">
+ <div class="col-lg-6">
<%= f.input :password,
as: :password_with_hints,
required: true,
diff --git a/app/views/devise/two_factor_authentication/show.html.erb b/app/views/devise/two_factor_authentication/show.html.erb
index 964870ab3..5fab80bda 100644
--- a/app/views/devise/two_factor_authentication/show.html.erb
+++ b/app/views/devise/two_factor_authentication/show.html.erb
@@ -1,6 +1,8 @@
<%= content_for :title, t('.title') %>
-<h4>
+<h4 class="mb-5"><%= t('.title') %></h4>
+
+<p>
<% if resource.direct_otp %>
<% if resource.direct_otp_delivery_method == 'mobile_phone' %>
<%= t('devise.two_factor_authentication.enter_code_direct_otp_mobile_phone', phone: masked_phone(resource.mobile_phone)) %>
@@ -10,11 +12,11 @@
<% else %>
<%= t('devise.two_factor_authentication.enter_code_totp') %>
<% end %>
-</h4>
+</p>
<%= simple_form_for(resource, url: user_two_factor_authentication_path, html: { method: :put, class: 'my-3' }) do |f| %>
- <div class="row">
- <div class="col-md-6">
+ <div class="row pure__row--small">
+ <div class="col-lg-6">
<div class="form-inputs">
<div class="form-group required mt-0">
<%= text_field_tag :code,
@@ -25,7 +27,7 @@
autofocus: true,
autocomplete: 'off',
class: 'form-control string required'%>
- <p class="mt-2 mb-0">
+ <p class="mt-2 mb-5">
<% if resource.direct_otp %>
<%= link_to t('devise.two_factor_authentication.resend_code'), [:resend_code, resource_name, :two_factor_authentication] %>
<% else %>
@@ -38,11 +40,11 @@
</div>
</div>
</div>
- <div class="col-md-6">
+ <div class="col-lg-6">
<%= link_to t('devise.shared.links.sign_out'),
destroy_user_session_path,
method: :delete,
- class: "btn btn-danger float-end" %>
+ class: "btn btn-outline-danger" %>
<%= f.button :submit,
t('devise.two_factor_authentication.validate'),
class: "btn btn-primary" %>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 6c3eb195d..94bacbf48 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -12,26 +12,18 @@
</head>
<body class="<%= body_classes %>">
<div class="container">
- <div class="row">
- <div class="col-sm-10 mx-auto">
- <h1 class="my-5 py-5 text-center">
- <%= link_to root_path do %>
- <%= render 'logo' %>
- <% end %>
- </h1>
- <div class="card">
- <div class="card-body text-start">
- <% unless notice.blank? %>
- <div class="alert alert-success mt-2" role="alert"><%= notice.html_safe %></div>
- <% end %>
- <% unless alert.blank? %>
- <div class="alert alert-danger mt-2" role="alert"><%= alert.html_safe %></div>
- <% end %>
- <%= yield %>
- </div>
- </div>
- </div>
- </div>
+ <h1 class="my-5 py-5 text-center">
+ <%= link_to root_path do %>
+ <%= render 'logo' %>
+ <% end %>
+ </h1>
+ <% unless notice.blank? %>
+ <div class="alert alert-success mt-2" role="alert"><%= notice.html_safe %></div>
+ <% end %>
+ <% unless alert.blank? %>
+ <div class="alert alert-danger mt-2" role="alert"><%= alert.html_safe %></div>
+ <% end %>
+ <%= yield %>
</div>
<%= render 'footer' %>
<%= render 'gdpr/cookie_consent' %>
--
GitLab