From 3ac84a5b1114de7f11e0cd08f1916810cf8296df Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 25 Aug 2016 18:24:30 +0200
Subject: [PATCH] Overhauled/improved mobile menu

---
 com.woltlab.wcf/templates/pageMenuMobile.tpl       | 14 +++++++-------
 .../js/WoltLabSuite/Core/Ui/Page/Menu/Main.js      |  8 ++++----
 wcfsetup/install/files/style/ui/menuMobile.scss    |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index 94405ea432..3d8f130db9 100644
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -19,6 +19,12 @@
 					{/if}
 		{/foreach}
 		<li class="menuOverlayItemSpacer"></li>
+		<li class="menuOverlayItem" data-more="com.woltlab.wcf.search">
+			<a href="#" class="menuOverlayItemLink box24">
+				<span class="icon icon24 fa-search"></span>
+				<span class="menuOverlayItemTitle">{lang}wcf.global.search{/lang}</span>
+			</a>
+		</li>			
 		<li class="menuOverlayItem" id="pageMainMenuMobilePageOptionsContainer">
 			<a href="#" class="menuOverlayItemLink box24">
 				<span class="icon icon24 fa-gears"></span>
@@ -46,13 +52,7 @@
 			{/content}
 		{/hascontent}
 		
-		<li class="menuOverlayItemSpacer"></li>
-		<li class="menuOverlayItem" data-more="com.woltlab.wcf.search">
-			<a href="#" class="menuOverlayItemLink box24">
-				<span class="icon icon24 fa-search"></span>
-				<span class="menuOverlayItemTitle">{lang}wcf.global.search{/lang}</span>
-			</a>
-		</li>
+		
 	</ol>
 </div>
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
index 67ecd6f5a4..5617598f17 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
@@ -31,7 +31,7 @@ define(['Core', 'Dom/Traverse', './Abstract'], function(Core, DomTraverse, UiPag
 			if (_container !== null) {
 				_list = DomTraverse.childByClass(_container, 'menuOverlayItemList');
 				_navigationList = elBySel('.jsPageNavigationIcons');
-				_spacer = _container.nextElementSibling;
+				//_spacer = _container.nextElementSibling;
 				
 				// remove placeholder item
 				elRemove(DomTraverse.childByClass(_list, 'jsMenuOverlayItemPlaceholder'));
@@ -74,11 +74,11 @@ define(['Core', 'Dom/Traverse', './Abstract'], function(Core, DomTraverse, UiPag
 				}
 				
 				elShow(_container);
-				elShow(_spacer);
+				//elShow(_spacer);
 			}
 			else {
 				elHide(_container);
-				elHide(_spacer);
+				//elHide(_spacer);
 			}
 			
 			return true;
@@ -91,7 +91,7 @@ define(['Core', 'Dom/Traverse', './Abstract'], function(Core, DomTraverse, UiPag
 			
 			if (_hasItems) {
 				elHide(_container);
-				elHide(_spacer);
+				//elHide(_spacer);
 				
 				var item, link, title = DomTraverse.childByClass(_list, 'menuOverlayTitle');
 				while (item = title.nextElementSibling) {
diff --git a/wcfsetup/install/files/style/ui/menuMobile.scss b/wcfsetup/install/files/style/ui/menuMobile.scss
index 753f83472d..1497020f57 100644
--- a/wcfsetup/install/files/style/ui/menuMobile.scss
+++ b/wcfsetup/install/files/style/ui/menuMobile.scss
@@ -149,7 +149,7 @@
 }
 
 .menuOverlayItemSpacer {
-	margin-top: 20px;
+	margin-top: 25px;
 	
 	/* avoid successive spacers piling up */
 	& + .menuOverlayItemSpacer {
@@ -222,13 +222,13 @@
 	}
 	
 	&.menuOverlayItemLinkMore::after {
-		color: rgb(204, 204, 204);
+		color: #fff;
 		content: $fa-var-angle-right;
 		display: block;
 		font-family: FontAwesome;
-		font-size: 24px;
+		font-size: 18px;
 		position: absolute;
-		right: 10px;
+		right: 18px;
 		top: 50%;
 		transform: translateY(-50%);
 	}
-- 
2.20.1