From 1f770b5e457056b6458174bd00368564522bc4b3 Mon Sep 17 00:00:00 2001
From: SeanChenTaipei <sean96545@gmail.com>
Date: Fri, 3 Mar 2023 02:27:42 +0800
Subject: [PATCH] g

---
 templates/base.html         | 20 +++++++++++++++++---
 templates/login.html        | 17 +----------------
 templates/registration.html | 15 ++++++++++++++-
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 8304392..f5390a6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -22,9 +22,13 @@
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css">
         {% endblock %}
         <style>
+            html {
+                position: relative;
+                min-height: 100%;
+            }
             body {
                 padding-top: 70px;
-                padding-bottom: 70px;
+                padding-bottom: 10px;
                 background-color: #eee;
                 /* font-size: 2vw; */
                 font-family: Georgia, sans-serif !important;
@@ -46,7 +50,17 @@
             p {
                 text-indent: 2em;
             }
-            {% block style %}{% endblock %}
+            .footer {
+                position: absolute;
+                bottom: 0;
+                width: 100%;
+                /* Set the fixed height of the footer here */
+                height: 60px;
+                background-color: #f5f5f5;
+              }
+            {% block style %}
+            
+            {% endblock %}
         </style>
         
     </head>
@@ -278,7 +292,7 @@
         </div>
         
         {% endblock content %}
-        <footer class="text-center text-white" style="background-color: #6171ce">
+        <footer id="footer" class="text-center text-white" style="background-color: #6171ce;margin-bottom: 0">
             <div
                 class="text-center p-3"
                 style="background-color: rgba(0, 0, 0, 0.2)"
diff --git a/templates/login.html b/templates/login.html
index 3ebd9a7..e63ad60 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="container-fluid fade-in" style="background-color: #eee;">
+<div class="container-fluid fade-in" style="background-color: #eee;min-height:100%;position:relative;">
   <div class="container-fluid px-1 py-4">
     <div class="row d-flex justify-content-center align-items-center h-100">
       <div class="col-lg-12 col-xl-11">
@@ -67,19 +67,4 @@
   </div>
 </div>
 
-<!-- {% with messages = get_flashed_messages() %}
-  {% if messages %}
-    {% for message in messages %}
-    <div class="alert alert-danger" role="alert">
-      {{ message }}
-    </div>
-    {% endfor %}
-  {% endif %}
-{% endwith %} -->
-
-{% if error %}
-<div class="alert alert-danger" role="alert">
-  {{ error }}
-</div>
-{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/registration.html b/templates/registration.html
index 242d39c..790059f 100644
--- a/templates/registration.html
+++ b/templates/registration.html
@@ -3,8 +3,21 @@
 
 
 {% block title %}Registration Page{% endblock %}
+
+{% block style %}
+body {
+  padding-top: 70px;
+  padding-bottom: 70px;
+  background-color: #eee;
+  /* font-size: 2vw; */
+  font-family: Georgia, sans-serif !important;
+  flex-direction: column;
+  height:100vh;
+  background-color: #eee;
+}
+{% endblock style %}
 {% block content %}
-<section class="container-fluid" style="background-color: #eee;">
+<section class="container-fluid" style="background-color: #eee;min-height:100%;position:relative;">
   <div class="container-fluid px-1 py-4">
     <div class="row d-flex justify-content-center align-items-center h-100">
       <div class="col-lg-12 col-xl-11">