From f194baae00b587bc64bff50c390e8e939fd9d320 Mon Sep 17 00:00:00 2001
From: Eragon <eragon@eragon.re>
Date: Tue, 5 Sep 2023 22:44:04 +0200
Subject: [PATCH] Revert "style: Push the footer to the bottom regardless of
 the size of maincontent"

This reverts commit c374fb44f68dbb6a45ffea34551ffafe39f91e5f.
---
 app/static/css/container.css   |  1 -
 app/static/css/footer.css      |  8 +-------
 app/static/css/global.css      |  2 --
 app/static/css/header.css      |  1 -
 app/static/less/container.less |  1 -
 app/static/less/footer.less    | 18 ++++--------------
 app/static/less/global.less    |  4 +---
 app/static/less/header.less    |  1 -
 app/templates/base/base.html   |  4 ++--
 9 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/app/static/css/container.css b/app/static/css/container.css
index 505100c..06fe90a 100644
--- a/app/static/css/container.css
+++ b/app/static/css/container.css
@@ -1,5 +1,4 @@
 .container {
-  min-height: 88vh;
   margin-left: 110px;
 }
 @media screen and (max-width:849px) {
diff --git a/app/static/css/footer.css b/app/static/css/footer.css
index 0549f70..0266495 100644
--- a/app/static/css/footer.css
+++ b/app/static/css/footer.css
@@ -1,6 +1,5 @@
 footer {
-  min-height: 10vh;
-  margin: 20px 0 0 110px;
+  margin: 20px 0 0 0;
   padding: 10px 10%;
   text-align: center;
   font-size: 11px;
@@ -11,9 +10,4 @@ footer {
 }
 footer p {
   margin: 3px 0;
-}
-@media screen and (max-width:849px) {
-  footer {
-    margin-left: 0;
-  }
 }
\ No newline at end of file
diff --git a/app/static/css/global.css b/app/static/css/global.css
index 393743b..b1f829c 100644
--- a/app/static/css/global.css
+++ b/app/static/css/global.css
@@ -25,8 +25,6 @@
   transition: .15s ease;
 }
 body {
-  width: 100vw;
-  height: 100vh;
   margin: 0;
   background: var(--background);
   color: var(--text);
diff --git a/app/static/css/header.css b/app/static/css/header.css
index b2031ce..7429d1e 100644
--- a/app/static/css/header.css
+++ b/app/static/css/header.css
@@ -1,5 +1,4 @@
 header {
-  min-height: 5vh;
   margin: 0;
   padding: 8px 16px;
   background: var(--background);
diff --git a/app/static/less/container.less b/app/static/less/container.less
index 8404913..94b9bb2 100644
--- a/app/static/less/container.less
+++ b/app/static/less/container.less
@@ -1,7 +1,6 @@
 @import "vars";
 
 .container {
-    min-height: 88vh;
     margin-left: 110px;
 
     @media screen and (max-width: @tiny) {
diff --git a/app/static/less/footer.less b/app/static/less/footer.less
index 0d7f501..0091485 100644
--- a/app/static/less/footer.less
+++ b/app/static/less/footer.less
@@ -1,24 +1,14 @@
-@import "vars";
 /*
     Footer
 */
 
 footer {
-    min-height: 10vh;
-    margin: 20px 0 0 110px;
-    padding: 10px 10%;
-    text-align: center;
-    font-size: 11px;
-    font-style: italic;
-    background: var(--background);
-    color: var(--text);
+    margin: 20px 0 0 0; padding: 10px 10%;
+    text-align: center; font-size: 11px; font-style: italic;
+    background: var(--background); color: var(--text);
     border-top: var(--border);
 
     p {
-        margin: 3px 0;
-    }
-
-    @media screen and (max-width: @tiny) {
-        margin-left: 0;
+    	margin: 3px 0;
     }
 }
diff --git a/app/static/less/global.less b/app/static/less/global.less
index a22b53c..74dac5d 100644
--- a/app/static/less/global.less
+++ b/app/static/less/global.less
@@ -17,8 +17,6 @@
 }
 
 body {
-    width: 100vw;
-    height: 100vh;
     margin: 0;
     background: var(--background);
     color: var(--text);
@@ -158,7 +156,7 @@ button, .button, input[type="button"], input[type="submit"] {
     left: 50%;
     padding: 8px;
     position: absolute;
-    transform: translateY(-200%);
+    transform: translateY(-100%);
     transition: transform 0.3s;
     background: var(--links);
     color: var(--warn-text);
diff --git a/app/static/less/header.less b/app/static/less/header.less
index d0673b0..c4436ca 100644
--- a/app/static/less/header.less
+++ b/app/static/less/header.less
@@ -1,7 +1,6 @@
 @import "vars";
 
 header {
-    min-height: 5vh;
     margin: 0; padding: 8px 16px;
     background: var(--background); border-bottom: var(--border);
 
diff --git a/app/templates/base/base.html b/app/templates/base/base.html
index 1df0ac0..1c8f1ad 100644
--- a/app/templates/base/base.html
+++ b/app/templates/base/base.html
@@ -17,9 +17,9 @@
 		{% block content %}
 		<div id="main-content"></div>
 		{% endblock %}
-	</div>
 
-	{% include "base/footer.html" %}
+		{% include "base/footer.html" %}
+	</div>
 
 	{% include "base/scripts.html" %}
 </body>