From 9de7a1d4b2d41911b9f8f2a738c6695efa06fcf2 Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Sat, 1 Oct 2022 16:07:37 -0400
Subject: [PATCH] =?UTF-8?q?feat(core):=20=E2=9C=A8=20move=20catlinks=20to?=
 =?UTF-8?q?=20body=20footer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins.citizen.styles.toc/skins.citizen.styles.toc.less  | 3 ++-
 resources/skins.citizen.styles/layout.less                  | 5 +++--
 templates/ContentFooter.mustache                            | 6 ++++++
 templates/skin.mustache                                     | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 templates/ContentFooter.mustache

diff --git a/resources/skins.citizen.styles.toc/skins.citizen.styles.toc.less b/resources/skins.citizen.styles.toc/skins.citizen.styles.toc.less
index 61eaaeee..a8e484ea 100644
--- a/resources/skins.citizen.styles.toc/skins.citizen.styles.toc.less
+++ b/resources/skins.citizen.styles.toc/skins.citizen.styles.toc.less
@@ -247,7 +247,8 @@
 	@media ( min-width: @width-breakpoint-desktop-wide ) {
 		.citizen-toc-enabled {
 			.mw-body-header,
-			.citizen-body {
+			.citizen-body,
+			.mw-body-footer {
 				// Reserve space for ToC
 				padding-right: var( --width-toc );
 			}
diff --git a/resources/skins.citizen.styles/layout.less b/resources/skins.citizen.styles/layout.less
index 725194db..05ce0dbb 100644
--- a/resources/skins.citizen.styles/layout.less
+++ b/resources/skins.citizen.styles/layout.less
@@ -13,7 +13,8 @@
 }
 
 .mw-body-header,
-.citizen-body {
+.citizen-body,
+.mw-body-footer {
 	max-width: var( --width-layout );
 	margin-right: auto;
 	margin-left: auto;
@@ -78,13 +79,13 @@ a.image {
 }
 
 @media ( min-width: @width-breakpoint-desktop ) {
-	// Reserve space for header
 	.mw-body,
 	.parsoid-body,
 	.mw-footer {
 		padding-right: ~'calc( var( --padding-page ) * 2 )';
 		padding-left: ~'calc( var( --padding-page ) * 2 )';
 		margin-bottom: 0;
+		// Reserve space for header
 		margin-left: var( --header-size );
 	}
 }
diff --git a/templates/ContentFooter.mustache b/templates/ContentFooter.mustache
new file mode 100644
index 00000000..1c722544
--- /dev/null
+++ b/templates/ContentFooter.mustache
@@ -0,0 +1,6 @@
+{{!
+	
+}}
+<footer class="mw-body-footer">
+	{{{html-categories}}}
+</footer>
\ No newline at end of file
diff --git a/templates/skin.mustache b/templates/skin.mustache
index b75a21ba..bbbd68db 100644
--- a/templates/skin.mustache
+++ b/templates/skin.mustache
@@ -19,8 +19,8 @@
 		{{#html-undelete-link}}<div id="contentSub2">{{{html-undelete-link}}}</div>{{/html-undelete-link}}
 		{{{html-user-message}}}
 		{{{html-body-content--formatted}}}
-		{{{html-categories}}}
 	</div>
+	{{>ContentFooter}}
 </main>
 {{{html-after-content}}}
 {{#data-citizen-footer}}{{>Footer}}{{/data-citizen-footer}}