From fe0af2caed0543d0f343a706d3793d6ec60a545c Mon Sep 17 00:00:00 2001
From: rainydaysavings <eliseuamaro@pm.me>
Date: Fri, 21 Aug 2020 03:16:20 +0100
Subject: [PATCH] [UI] Fixing login and register styling, refactoring

---
 public/assets/css/login/login.css       | 26 +++++++-----
 public/assets/css/register/register.css | 56 -------------------------
 templates/security/register.html.twig   |  2 +-
 3 files changed, 17 insertions(+), 67 deletions(-)
 delete mode 100644 public/assets/css/register/register.css

diff --git a/public/assets/css/login/login.css b/public/assets/css/login/login.css
index 68df1a60d4..2b827e397a 100644
--- a/public/assets/css/login/login.css
+++ b/public/assets/css/login/login.css
@@ -9,10 +9,10 @@
 }
 form {
     font-size: var(--medium-size);
-    background-color: #61778C30;
+    background-color: var(--bg2);
     padding: calc(2 * var(--unit-size));
-    border-radius: var(--unit-size);
-    box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75);
+    border-radius: var(--small-size);
+    border: solid 2px var(--accent-low);
 }
 label {
     font-family: 'Montserrat', sans-serif;
@@ -27,8 +27,8 @@ input[type=password],
 input[type=email]
 {
     margin-top: calc(var(--unit-size) * 0.5);
-    background-color: rgba(0, 0, 0, 0.30);
-    color: #f6f6f6;
+    background-color: var(--bg1);
+    color: var(--fg);
     border-style: none;
     padding: calc(var(--unit-size) * 0.5);
     border-radius: calc(var(--unit-size) * 0.5);
@@ -36,13 +36,17 @@ input[type=email]
     margin-bottom: var(--unit-size);
     width: calc(100% - var(--unit-size));
 }
+.checkbox {
+    display: flex;
+    vertical-align: center;
+}
 .checkbox label {
     font-family: "Open Sans", sans-serif;
-    font-size: var(--medium-size);
+    font-size: var(--unit-size);
     font-weight: normal;
 }
 .active {
-    color: #F6F6F6 !important;
+    color: var(--fg) !important;
     font-weight: 700;
 }
 input {
@@ -50,8 +54,10 @@ input {
 }
 
 button {
-    background-color: #f6f6f6;
-    padding: var(--small-size);
-    border: none;
+    color: var(--fg);
+    font-size: var(--unit-size);
+    background-color: var(--bg1);
+    padding: var(--small-size) var(--main-size) var(--small-size) var(--main-size);
+    border: solid 2px var(--accent-low);
     border-radius: var(--small-size);
 }
\ No newline at end of file
diff --git a/public/assets/css/register/register.css b/public/assets/css/register/register.css
deleted file mode 100644
index b13ee42824..0000000000
--- a/public/assets/css/register/register.css
+++ /dev/null
@@ -1,56 +0,0 @@
-.content {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    align-items: center;
-    margin-right: var(--small-size);
-    margin-left: var(--small-size);
-    margin-bottom: var(--unit-size);
-}
-form {
-    font-size: var(--medium-size);
-    background-color: #61778C30;
-    padding: calc(2 * var(--unit-size));
-    border-radius: var(--unit-size);
-    box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75);
-}
-label {
-    font-family: 'Montserrat', sans-serif;
-    font-weight: 700;
-    width: 100%;
-}
-button {
-    margin-top: var(--unit-size);
-}
-input[type=text],
-input[type=password],
-input[type=email]
-{
-    margin-top: calc(var(--unit-size) * 0.5);
-    background-color: rgba(0, 0, 0, 0.30);
-    color: #f6f6f6;
-    border-style: none;
-    padding: calc(var(--unit-size) * 0.5);
-    border-radius: calc(var(--unit-size) * 0.5);
-    font-size: var(--medium-size);
-    margin-bottom: var(--unit-size);
-    width: calc(100% - var(--unit-size));
-}
-.checkbox label {
-    font-family: "Open Sans", sans-serif;
-    font-size: var(--medium-size);
-    font-weight: normal;
-}
-.active {
-    color: #F6F6F6 !important;
-    font-weight: 700;
-}
-input {
-    filter: none;
-}
-button {
-    background-color: #f6f6f6;
-    padding: var(--small-size);
-    border: none;
-    border-radius: var(--small-size);
-}
\ No newline at end of file
diff --git a/templates/security/register.html.twig b/templates/security/register.html.twig
index 6a07832b74..6009b2fed6 100644
--- a/templates/security/register.html.twig
+++ b/templates/security/register.html.twig
@@ -2,7 +2,7 @@
 
 {% block stylesheets %}
     {{ parent() }}
-    <link rel='stylesheet' type='text/css' href="{{ asset('assets/css/register/register.css') }}">
+    <link rel='stylesheet' type='text/css' href="{{ asset('assets/css/login/login.css') }}">
 {% endblock %}
 
 {% block title %}Register{% endblock %}