Frontend fixes

Pauli1010 · Aug 11, 2023 · 011e603 · 011e603
1 parent 7a2ea62
commit 011e603
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 41 deletions.
diff --git a/app/assets/stylesheets/floating-labels.scss b/app/assets/stylesheets/floating-labels.scss
@@ -23,6 +23,17 @@
   border: 1px solid transparent;
   border-radius: .25rem;
   transition: all .1s ease-in-out;
+
+  &.checkbox-label {
+    position: relative;
+    display: inline-block;
+    width: auto;
+    height: 20px;
+    padding: 0 10px !important;
+    font-size: 13px !important;
+    color: #495057 !important;
+    vertical-align: top;
+  }
 }
 
 .form-label-group input::-webkit-input-placeholder {

diff --git a/app/views/password_resets/edit.html.haml b/app/views/password_resets/edit.html.haml
@@ -2,13 +2,13 @@
 = render 'application/flash'
 
 = simple_form_for @form, url: password_reset_path(@token), method: :patch, scope: :user, class: 'simple_form form-horizontal', data: { turbo: "false" } do |f|
-  %legend.text-center.mb-4= t('.legend')
+  %fieldset
+    %legend.text-center.mb-4= t('.legend')
 
-  = render 'password_fields', f: f
-
-  .actions.text-center
-    = f.submit t(".reset"), class: 'btn-sm btn-primary btn-max-width'
+    = render 'password_fields', f: f
 
+    .actions.text-center
+      = f.submit t(".reset"), class: 'btn-sm btn-primary btn-max-width'
 
 %ul.text-center.mb-4.font-weight-normal
   %li

diff --git a/app/views/password_resets/new.html.haml b/app/views/password_resets/new.html.haml
@@ -2,14 +2,15 @@
 = render 'application/flash'
 
 = simple_form_for @form, url: password_resets_path, method: :post, scope: :user, class: 'simple_form form-horizontal', data: { turbo: "false" } do |f|
-  %legend.text-center.mb-4= t('.legend')
-  .form-label-group
-    = f.label :email, t('email', scope: 'activemodel.attributes.user')
-    %br
-    = f.input :email, class: 'form-control', label: false
+  %fieldset
+    %legend.text-center.mb-4= t('.legend')
+    .form-label-group
+      = f.label :email, t('email', scope: 'activemodel.attributes.user')
+      %br
+      = f.input :email, class: 'form-control', label: false
 
-  .actions.text-center
-    = f.submit t(".reset"), class: 'btn-sm btn-primary btn-max-width'
+    .actions.text-center
+      = f.submit t(".reset"), class: 'btn-sm btn-primary btn-max-width'
 
 
 %ul.text-center.mb-4.font-weight-normal

diff --git a/app/views/registrations/_form.html.haml b/app/views/registrations/_form.html.haml
@@ -1,19 +1,20 @@
 = simple_form_for @form, url: registrations_path, method: :post, scope: :user, class: 'simple_form form-horizontal', data: { turbo: "false" } do |f|
-  %legend.text-center.mb-4= t('.legend')
-  .form-label-group
-    = f.label :email, t('email', scope: 'activemodel.attributes.user')
-    %br
-    = f.input :email, class: 'form-control', label: false
+  %fieldset
+    %legend.text-center.mb-4= t('.legend')
+    .form-label-group
+      = f.label :email, t('email', scope: 'activemodel.attributes.user')
+      %br
+      = f.input :email, class: 'form-control', label: false
 
-  .form-label-group
-    = f.label :password, t('password', scope: 'activemodel.attributes.user')
-    %br
-    = f.input :password, class: 'form-control', label: false
+    .form-label-group
+      = f.label :password, t('password', scope: 'activemodel.attributes.user')
+      %br
+      = f.input :password, class: 'form-control', label: false
 
-  .form-label-group
-    = f.label :password_confirmation, t('password_confirmation', scope: 'activemodel.attributes.user')
-    %br
-    = f.input :password_confirmation, class: 'form-control', label: false
+    .form-label-group
+      = f.label :password_confirmation, t('password_confirmation', scope: 'activemodel.attributes.user')
+      %br
+      = f.input :password_confirmation, class: 'form-control', label: false
 
-  .actions.text-center
-    = f.submit t(".register"), class: 'btn-sm btn-primary btn-max-width'
+    .actions.text-center
+      = f.submit t(".register"), class: 'btn-sm btn-primary btn-max-width'
diff --git a/app/views/sessions/_form.html.haml b/app/views/sessions/_form.html.haml
@@ -1,15 +1,16 @@
 = form_with url: login_path, method: :post, class: 'simple_form form-horizontal', id: "login-form" do |f|
-  %legend.text-center.mb-4= t('.legend')
-  .form-label-group
-    = f.label :email, t('email', scope: 'activemodel.attributes.user')
-    %br
-    = f.text_field :email, class: 'form-control'
-  .form-label-group
-    = f.label :password, t('password', scope: 'activemodel.attributes.user')
-    %br
-    = f.password_field :password, class: 'form-control'
-  .form-label-group
-    = f.check_box :remember_me, class: 'form-control'
-    = f.label :remember_me, t('remember_me', scope: 'activemodel.attributes.user')
-  .actions.text-center
-    = f.submit t(".login"), class: 'btn-sm btn-primary btn-max-width'
+  %fieldset
+    %legend.text-center.mb-4= t('.legend')
+    .form-label-group
+      = f.label :email, t('email', scope: 'activemodel.attributes.user')
+      %br
+      = f.text_field :email, class: 'form-control'
+    .form-label-group
+      = f.label :password, t('password', scope: 'activemodel.attributes.user')
+      %br
+      = f.password_field :password, class: 'form-control'
+    .checkbox
+      = f.check_box :remember_me
+      = f.label :remember_me, t('remember_me', scope: 'activemodel.attributes.user'), class: 'checkbox-label'
+    .actions.text-center
+      = f.submit t(".login"), class: 'btn-sm btn-primary btn-max-width'