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 345e9db9e511b3373ad25c17ab533bf59f467fa9..a54597f2fac418b40ad1d1f7285faadc2f7aa0bf 100644 (file)
--- 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 6ec7895a31e918bf8471c25c33edb76698675692..cbe04023f37b79016b59a2c90988be8e09848aab 100644 (file)
--- 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;
 }