From d9c0a72e36f1b1492036efea8ec7f886fa8d8c14 Mon Sep 17 00:00:00 2001
From: Eliseu Amaro <mail@eliseuama.ro>
Date: Wed, 24 Nov 2021 13:59:46 +0000
Subject: [PATCH] [CONFIG] Replaced form theme used since it was too
 opinionated.

---
 config/packages/twig.yaml                       |  2 +-
 .../default_theme/css/widgets/sections.css      | 17 +++++------------
 templates/security/login.html.twig              |  5 ++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index 68a1da1a31..89279319d2 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,2 +1,2 @@
 twig:
-  form_themes: ['bootstrap_3_layout.html.twig']
\ No newline at end of file
+  form_themes: ['tailwind_2_layout.html.twig']
\ No newline at end of file
diff --git a/public/assets/default_theme/css/widgets/sections.css b/public/assets/default_theme/css/widgets/sections.css
index b86f1ec915..1723442a0d 100644
--- a/public/assets/default_theme/css/widgets/sections.css
+++ b/public/assets/default_theme/css/widgets/sections.css
@@ -120,34 +120,27 @@
     font-size: 1.62rem;
 }
 
-.form-group {
+div[class^="mb-"] {
     display: flex;
     flex-direction: column;
     flex-basis: border-box;
     margin-bottom: var(--smaller);
 }
 
-.form-group:last-of-type {
+div[class^="mb-"]:last-of-type {
     margin-bottom: unset;
 }
 
-.form-group textarea {
+div[class^="mb-"] textarea {
     height: 7rem;
     max-height: 100%;
 }
 
-.help-block {
-    margin-bottom: 6px;
-}
-
-.help-text {
+.alert,.alert-danger {
+    display: inline-block;
     font-style: italic;
     font-size: 1rem;
-    margin-bottom: 6px;
-}
 
-.help-block>.list-unstyled,.alert,.alert-danger {
-    display: inline-block;
     border: solid 2px #ff6347;
     background-color: #FF634733;
     border-radius: .6rem;
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 71b1fcead6..752af2d247 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -37,14 +37,13 @@
 
                 {% else %}
 
-                    {# TODO: Login can be done with email, so the element id's should reflect that #}
-                    <div class="form-group">
+                    <div class="mb-3">
                         <label class="section-form-label" for="inputNicknameOrEmail">{{ "Nickname or Email" | trans }}</label>
                         <input type="text" value="{{ last_login_id }}" name="nickname_or_email" id="inputNicknameOrEmail"
                                class="form-control" required autofocus>
                         <p class="help-text">{{ "Your nickname or email address." | trans }}</p>
                     </div>
-                    <div class="form-group">
+                    <div class="mb-3">
                         <label class="section-form-label" for="inputPassword">{{ "Password" | trans }}</label>
                         <input type="password" name="password" id="inputPassword" class="form-control" required>
                         <p class="help-text">{{ "Your account's password." | trans }}</p>