From 4c6ae1e74d121df9b2b4e5a18c55f1bbd75be2ee Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Thu, 9 May 2024 14:38:07 -0400
Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E2=99=BB=EF=B8=8F=20wrap=20m?=
 =?UTF-8?q?enu=20list=20in=20container?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/skins.citizen.styles/components/Menu.less | 10 +++++-----
 templates/Menu.mustache                             | 10 +---------
 templates/MenuContents.mustache                     |  8 ++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 templates/MenuContents.mustache

diff --git a/resources/skins.citizen.styles/components/Menu.less b/resources/skins.citizen.styles/components/Menu.less
index c9babfad..a68a8f6f 100644
--- a/resources/skins.citizen.styles/components/Menu.less
+++ b/resources/skins.citizen.styles/components/Menu.less
@@ -11,6 +11,11 @@
 		letter-spacing: 0.05em;
 	}
 
+	&__content-list {
+		margin: 0;
+		list-style: none;
+	}
+
 	.mw-list-item {
 		line-height: var( --line-height-xs );
 
@@ -48,11 +53,6 @@
 			}
 		}
 	}
-
-	ul {
-		margin: 0;
-		list-style: none;
-	}
 }
 
 // FIXME: This should not be here
diff --git a/templates/Menu.mustache b/templates/Menu.mustache
index 3a14d120..54ed3900 100644
--- a/templates/Menu.mustache
+++ b/templates/Menu.mustache
@@ -1,16 +1,8 @@
-{{!
-
-}}
 <nav id="{{id}}" class="citizen-menu{{#class}} {{.}}{{/class}}" {{{html-tooltip}}} {{{html-userlangattributes}}}>
 	{{#label}}
 	<div class="citizen-menu__heading{{#label-class}} {{.}}{{/label-class}}">
 		{{{.}}}
 	</div>
 	{{/label}}
-	{{{html-before-portal}}}
-	<ul>
-		{{#array-list-items}}{{>MenuListItem}}{{/array-list-items}}
-		{{#html-items}}{{{.}}}{{/html-items}}
-	</ul>
-	{{{html-after-portal}}}
+	{{>MenuContents}}
 </nav>
\ No newline at end of file
diff --git a/templates/MenuContents.mustache b/templates/MenuContents.mustache
new file mode 100644
index 00000000..6daf19f6
--- /dev/null
+++ b/templates/MenuContents.mustache
@@ -0,0 +1,8 @@
+<div class="citizen-menu__content">
+	{{{html-before-portal}}}
+	<ul class="citizen-menu__content-list">
+		{{#array-list-items}}{{>MenuListItem}}{{/array-list-items}}
+		{{#html-items}}{{{.}}}{{/html-items}}
+	</ul>
+	{{{html-after-portal}}}
+</div>
\ No newline at end of file