From 6c9b9355927b7e4db9b23d5472ea379b54e7d564 Mon Sep 17 00:00:00 2001
From: John Hess <john@jthess.com>
Date: Fri, 7 Jun 2024 18:15:38 -0500
Subject: [PATCH] make footer sticky

---
 _includes/footer.html        | 14 +++++++-------
 _layouts/default.html        |  4 +---
 _layouts/informational.html  |  4 +++-
 _scss/helpers/utilities.scss |  3 +++
 _scss/pages/home.scss        |  4 +++-
 apps.html                    | 10 +---------
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/_includes/footer.html b/_includes/footer.html
index 8c72675..564e9cb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
-<footer class="footer-area">
-  <div class="container">
-    <div class="footer-area-wrapper text-center">
-        <a href="{{ site.baseurl }}/fdroid-webdash/">{% t view_all_apps %}</a> | <a href="https://gitlab.com/likebutter/butterapp">{% t built_on_fdroid %}</a>
-    </div>
-  </div>
-</footer>
+<footer class="push-footer">
+  <p>
+      <a href="https://gitlab.com/guardianproject/wind-fdroidclient">
+          The Butter App Store is built on F-Droid free software
+      </a>
+  </p>
+</footer>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 55d8afc..1674b38 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,6 +4,4 @@ layout: basic
 
 {% include header.html %}
 
-{{ content }}
-
-{% include footer.html %}
+{{ content }}
\ No newline at end of file
diff --git a/_layouts/informational.html b/_layouts/informational.html
index 953434a..0cab719 100644
--- a/_layouts/informational.html
+++ b/_layouts/informational.html
@@ -8,4 +8,6 @@ layout: basic
 
 <div class="informational-container">
     {{ content }}
-</div>
\ No newline at end of file
+</div>
+
+{% include footer.html %}
\ No newline at end of file
diff --git a/_scss/helpers/utilities.scss b/_scss/helpers/utilities.scss
index 59065b5..5172387 100644
--- a/_scss/helpers/utilities.scss
+++ b/_scss/helpers/utilities.scss
@@ -23,6 +23,9 @@ body {
 .main-area {
   margin: 0 auto;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
 }
 
 
diff --git a/_scss/pages/home.scss b/_scss/pages/home.scss
index 6589d69..8c5b34f 100644
--- a/_scss/pages/home.scss
+++ b/_scss/pages/home.scss
@@ -142,12 +142,15 @@ a:active {
 
 .top-nav {
   max-width: 860px;
+  width: -webkit-fill-available;
   margin: 0px auto;
   display: flex;
+  flex-direction: row;
   align-items: center;
 }
 
 .informational-container {
+  flex: 1;
   width: 100%;
   max-width: 680px;
   margin: 0 auto;
@@ -213,7 +216,6 @@ a:active {
   }
 }
 
-// TODO: Make this push to the bottom when the page isn't as tall as the viewport.
 .push-footer {
   font-size: 12px;
   text-align: center;
diff --git a/apps.html b/apps.html
index f0db9bd..307123a 100644
--- a/apps.html
+++ b/apps.html
@@ -16,12 +16,4 @@ breadcrumb: "App Store"
 </div>
 {% include sideload.html %}
 
-<a class="btn-secondary" href="{{ site.base_url }}/fdroid-webdash/">View in Browser</a>
-
-<footer class="push-footer">
-    <p>
-        <a href="https://gitlab.com/guardianproject/wind-fdroidclient">
-            The Butter App Store is built on F-Droid free software
-        </a>
-    </p>
-</footer>
\ No newline at end of file
+<a class="btn-secondary" href="{{ site.base_url }}/fdroid-webdash/">View in Browser</a>
\ No newline at end of file