From 8d576a497b0f2310d11a4d6a5232f98c6aaf8df0 Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Sun, 6 Nov 2022 17:08:13 +0100
Subject: [PATCH] Views: Put footer below the last content block

---
 app/views/admin/cache.php               | 2 --
 app/views/admin/crud/create.php         | 2 --
 app/views/admin/crud/edit.php           | 2 --
 app/views/admin/crud/index.php          | 2 --
 app/views/admin/crud/show.php           | 2 --
 app/views/admin/index.php               | 2 --
 app/views/admin/media.php               | 1 -
 app/views/admin/syntax-highlighting.php | 2 --
 app/views/content.php                   | 4 ----
 app/views/errors/404.php                | 2 --
 app/views/login.php                     | 2 --
 app/views/partials/footer.php           | 8 +++-----
 app/views/reset-password.php            | 2 --
 public/css/style.css                    | 9 +--------
 14 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/app/views/admin/cache.php b/app/views/admin/cache.php
index c586268..9ca138d 100644
--- a/app/views/admin/cache.php
+++ b/app/views/admin/cache.php
@@ -81,6 +81,4 @@ use \App\Classes\Config;
 			</div>
 		</div>
 	<?php } ?>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/app/views/admin/crud/create.php b/app/views/admin/crud/create.php
index b4ad76f..845c1b8 100644
--- a/app/views/admin/crud/create.php
+++ b/app/views/admin/crud/create.php
@@ -56,8 +56,6 @@
 
 				<input type="hidden" name="_token" value="<?= $this->csrfToken; ?>" />
 			</form>
-
-			<div class="pb-5"></div>
 		</div>
 	</div>
 </div>
diff --git a/app/views/admin/crud/edit.php b/app/views/admin/crud/edit.php
index 2947f49..51c419c 100644
--- a/app/views/admin/crud/edit.php
+++ b/app/views/admin/crud/edit.php
@@ -61,8 +61,6 @@
 
 				<input type="hidden" name="_token" value="<?= $this->csrfToken; ?>" />
 			</form>
-
-			<div class="pb-5"></div>
 		</div>
 	</div>
 </div>
diff --git a/app/views/admin/crud/index.php b/app/views/admin/crud/index.php
index 3c6074c..1b5b394 100644
--- a/app/views/admin/crud/index.php
+++ b/app/views/admin/crud/index.php
@@ -64,8 +64,6 @@
 					<a class="btn btn-dark" href="<?= $this->url ?>/create">New <?= $this->title; ?></a>
 				</div>
 			</div>
-
-			<div class="pb-5"></div>
 		</div>
 	</div>
 </div>
diff --git a/app/views/admin/crud/show.php b/app/views/admin/crud/show.php
index 98e7cff..f8a66b9 100644
--- a/app/views/admin/crud/show.php
+++ b/app/views/admin/crud/show.php
@@ -33,8 +33,6 @@
 <?php } ?>
 				</tbody>
 			</table>
-
-			<div class="pb-5"></div>
 		</div>
 	</div>
 </div>
diff --git a/app/views/admin/index.php b/app/views/admin/index.php
index adde72f..5dc2348 100644
--- a/app/views/admin/index.php
+++ b/app/views/admin/index.php
@@ -8,6 +8,4 @@
 			<?= !empty($this->user->last_name) ? ' ' . $this->user->last_name : ''; ?>
 		</h3>
 	</div>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/app/views/admin/media.php b/app/views/admin/media.php
index 3ae08b2..0c253c1 100644
--- a/app/views/admin/media.php
+++ b/app/views/admin/media.php
@@ -84,7 +84,6 @@
 
 			<?= $this->partial('../app/views/partials/pagination.php'); ?>
 
-			<div class="pb-5"></div>
 		</div>
 	</div>
 </div>
diff --git a/app/views/admin/syntax-highlighting.php b/app/views/admin/syntax-highlighting.php
index d0838e3..778e73c 100644
--- a/app/views/admin/syntax-highlighting.php
+++ b/app/views/admin/syntax-highlighting.php
@@ -28,6 +28,4 @@
 
 	<div id="syntax-parse"><pre class="line-numbers mb-4"><code class=""></code></pre></div>
 	<textarea id="syntax-parse-copy" class="admin-hidden"></textarea>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/app/views/content.php b/app/views/content.php
index a237d0c..226edf9 100644
--- a/app/views/content.php
+++ b/app/views/content.php
@@ -17,10 +17,6 @@
 		<?php if ($this->injectView != '') { ?>
 			<?= $this->partial($this->injectView); ?>
 		<?php } ?>
-
-		<?php if ($key === array_key_last($this->contents)) { ?>
-			<div class="pb-5"></div>
-		<?php } ?>
 		</div>
 
 	<?php } ?>
diff --git a/app/views/errors/404.php b/app/views/errors/404.php
index 65699bc..4881045 100644
--- a/app/views/errors/404.php
+++ b/app/views/errors/404.php
@@ -3,6 +3,4 @@
 		<p>Error <strong>404</strong>.</p>
 		<p>requested URL <?= $_SERVER["REQUEST_URI"] ?> was not found on this server.</p>
 	</div>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/app/views/login.php b/app/views/login.php
index ba59e29..43315d9 100644
--- a/app/views/login.php
+++ b/app/views/login.php
@@ -22,6 +22,4 @@
 	<br>
 	<a href="<?= Config::c('APP_URL'); ?>/reset-password">Forgot password</a>?
 <?php } ?>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/app/views/partials/footer.php b/app/views/partials/footer.php
index c32d852..f8e9756 100644
--- a/app/views/partials/footer.php
+++ b/app/views/partials/footer.php
@@ -2,10 +2,8 @@
 	use App\Classes\Config;
 ?>
 
-<footer class="mb-4">
-	<div class="row">
-		<div class="col-12 col-lg-12">
-			&copy; <?= date('Y'); ?> Rick van Vonderen
-		</div>
+<footer class="row mb-2">
+	<div class="col-12">
+		&copy; <?= date('Y'); ?> Rick van Vonderen
 	</div>
 </footer>
diff --git a/app/views/reset-password.php b/app/views/reset-password.php
index e749612..ea8df2b 100644
--- a/app/views/reset-password.php
+++ b/app/views/reset-password.php
@@ -9,6 +9,4 @@
 <?php } ?>
 
 	<?= $this->partial($this->injectView); ?>
-
-	<div class="pb-5"></div>
 </div>
diff --git a/public/css/style.css b/public/css/style.css
index 4d3d5ac..0a8a1c7 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -30,8 +30,7 @@ nav.shadow {
 
 .content {
 	position: relative;
-	/* height: calc(100% - 56px); */
-	min-height: calc(100vh - 80px);
+	min-height: calc(100vh - 104px - .5rem);
 	padding: 20px 20px 50px 20px;
 
 	background-color: #fff;
@@ -124,12 +123,6 @@ h3 span {
 /*----------------------------------------*/
 
 footer {
-	position: absolute;
-	bottom: 0;
-	width: calc(100% - 30px);
-	height: 50px;
-	padding-top: 10px;
-
 	text-align: center;
 	color: #909090;
 }