From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 11 Feb 2016 13:26:59 +0000 (+0100)
Subject: Changed positions of search area and user menu
X-Git-Tag: 3.0.0_Beta_1~2030^2~92
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9a31776968706cab2ad41da9675609cce0e8ccd;p=GitHub%2FWoltLab%2FWCF.git

Changed positions of search area and user menu
---

diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl
index 345e9db9e5..a54597f2fa 100644
--- a/com.woltlab.wcf/templates/pageHeader.tpl
+++ b/com.woltlab.wcf/templates/pageHeader.tpl
@@ -4,11 +4,11 @@
 			<div class="layoutBoundary">
 				{include file='pageHeaderLogo'}
 				
-				{include file='pageHeaderSearch'}
+				{include file='pageHeaderUser'}
 				
 				{include file='pageHeaderMenu'}
 				
-				{include file='pageHeaderUser'}
+				{include file='pageHeaderSearch'}
 			</div>
 		</div>
 		
diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss
index 6ec7895a31..cbe04023f3 100644
--- a/wcfsetup/install/files/style/layout/pageHeader.scss
+++ b/wcfsetup/install/files/style/layout/pageHeader.scss
@@ -176,7 +176,7 @@
 
 /* user panel */
 .userPanel {
-	flex: 0 0 auto;
+	flex: 0 0 50%;
 	
 	> ul {
 		display: flex;
@@ -247,8 +247,8 @@
 
 /* SEARCH AREA */
 .pageHeaderSearch {
-	// use a fixed width of 50% together with the logo to force a wrap
-	flex: 0 50%;
+	// use a fixed width of 50% to force a wrap
+	flex: 0 0 50%;
 	text-align: right;
 }