From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 29 Mar 2016 12:17:08 +0000 (+0200)
Subject: Overhauled main menu
X-Git-Tag: 3.0.0_Beta_1~1286^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93477b178d004cd73a23b450f3cb57401bfaa377;p=GitHub%2FWoltLab%2FWCF.git

Overhauled main menu
---

diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl
index 961efe1031..9dd0c62526 100644
--- a/com.woltlab.wcf/templates/pageHeader.tpl
+++ b/com.woltlab.wcf/templates/pageHeader.tpl
@@ -2,16 +2,13 @@
 	<header id="pageHeader" class="pageHeader">
 		<div>
 			<div class="layoutBoundary">
-				<div class="pageHeaderContainerLeft">
-					{include file='pageHeaderLogo'}
-					
-					{include file='pageHeaderMenu'}
-				</div>
-				<div class="pageHeaderContainerRight">
-					{include file='pageHeaderSearch'}
-					
-					{include file='pageHeaderUser'}
-				</div>
+				{include file='pageHeaderLogo'}
+				
+				{include file='pageHeaderSearch'}
+				
+				{include file='pageHeaderMenu'}
+				
+				{include file='pageHeaderUser'}
 			</div>
 		</div>
 		
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index fca070a86d..aa58bf8c1e 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1180,6 +1180,7 @@ WCF.Dropdown.Interactive.Instance = Class.extend({
 	open: function() {
 		WCF.Dropdown._closeAll();
 		
+		this._triggerElement.addClass('open');
 		this._container.addClass('open');
 		
 		this.render();
@@ -1189,6 +1190,7 @@ WCF.Dropdown.Interactive.Instance = Class.extend({
 	 * Closes the dropdown
 	 */
 	close: function() {
+		this._triggerElement.removeClass('open');
 		this._container.removeClass('open');
 	},
 	
@@ -1236,6 +1238,7 @@ WCF.Dropdown.Interactive.Instance = Class.extend({
 		else {
 			require(['Ui/Alignment'], (function(UiAlignment) {
 				UiAlignment.set(this._container[0], this._triggerElement[0], {
+					horizontal: 'right',
 					pointer: true
 				});
 			}).bind(this));
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Header/Fixed.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Header/Fixed.js
index a0c8a437ef..779f1da7e0 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Header/Fixed.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Header/Fixed.js
@@ -9,7 +9,7 @@
 define(['Core', 'EventHandler', 'Ui/CloseOverlay', 'Ui/Screen', 'Ui/SimpleDropdown'], function(Core, EventHandler, UiCloseOverlay, UiScreen, UiSimpleDropdown) {
 	"use strict";
 	
-	var _pageHeader, _pageHeaderContainer, _isFixed = false, _isMobile = false;
+	var _pageHeader, _pageHeaderContainer, _triggerHeight, _isFixed = false, _isMobile = false;
 	
 	/**
 	 * @exports     WoltLab/WCF/Ui/Page/Header/Fixed
@@ -41,6 +41,8 @@ define(['Core', 'EventHandler', 'Ui/CloseOverlay', 'Ui/Screen', 'Ui/SimpleDropdo
 		_initStickyPageHeader: function() {
 			_pageHeader.style.setProperty('min-height', _pageHeader.clientHeight + 'px');
 			
+			_triggerHeight = _pageHeader.clientHeight - elBySel('.mainMenu', _pageHeader).clientHeight;
+			
 			this._scroll();
 			window.addEventListener('scroll', this._scroll.bind(this));
 		},
@@ -79,7 +81,7 @@ define(['Core', 'EventHandler', 'Ui/CloseOverlay', 'Ui/Screen', 'Ui/SimpleDropdo
 		 * @protected
 		 */
 		_scroll: function() {
-			_isFixed = (window.scrollY > 50);
+			_isFixed = (window.scrollY > _triggerHeight);
 			
 			_pageHeader.classList[_isFixed ? 'add' : 'remove']('sticky');
 			_pageHeaderContainer.classList[_isFixed ? 'add' : 'remove']('stickyPageHeader');
diff --git a/wcfsetup/install/files/style/bootstrap/mixin/box.scss b/wcfsetup/install/files/style/bootstrap/mixin/box.scss
index 6f00c42980..11c29f89c0 100644
--- a/wcfsetup/install/files/style/bootstrap/mixin/box.scss
+++ b/wcfsetup/install/files/style/bootstrap/mixin/box.scss
@@ -7,7 +7,7 @@
 	}
 	
 	> :last-child {
-		flex: 1;
+		flex: 1 1 auto;
 		overflow: hidden;
 	}
 }
diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss
index 0ef065c4f5..f85239a668 100644
--- a/wcfsetup/install/files/style/layout/pageHeader.scss
+++ b/wcfsetup/install/files/style/layout/pageHeader.scss
@@ -19,28 +19,11 @@
 .pageHeader .layoutBoundary {
 	display: flex;
 	
-	.pageHeaderContainerLeft,
-	.pageHeaderContainerRight {
-		display: flex;
-	}
-	
-	.pageHeaderContainerLeft {
-		flex: 1 1 auto;
-	}
-	
-	.pageHeaderContainerRight {
-		flex: 0 0 auto;
-	}
-	
 	@include large-screen-only {
-		padding-top: 20px;
-		padding-bottom: 20px;
-		
-		.pageHeaderContainerLeft,
-		.pageHeaderContainerRight {
-			flex-direction: column;
-			justify-content: space-between;
-		}
+		align-items: center;
+		flex-wrap: wrap;
+		padding-top: 30px;
+		padding-bottom: 0;
 	}
 	
 	@include small-screen-only {
@@ -55,122 +38,97 @@
 	}
 	
 	@include large-screen-only {
-		margin-bottom: 15px;
+		flex: 0 0 50%;
+		margin-bottom: 30px;
 	}
 }
 
 /* MAIN MENU */
-.mainMenu .boxMenu {
-	display: flex;
-	flex-wrap: wrap;
+.mainMenu {
+	flex: 1 1 auto;
 	
-	> li {
-		flex: 0 0 auto;
-		
-		@include wcfFontHeadline;
-		
-		&:not(:last-child) {
-			margin-right: 15px;
-		}
+	.boxMenu {
+		display: flex;
+		flex-wrap: wrap;
 		
-		> a {
-			border-bottom: 3px solid $wcfHeaderMenuBackground;
-			color: $wcfHeaderMenuLink;
-			display: block;
-			font-size: 16px;
-			font-weight: 400;
-			padding: 5px 0 2px;
+		> li {
+			flex: 0 0 auto;
 			
-			> .boxMenuLinkOutstandingItems {
-				background-color: rgb(255, 255, 255);
-				color: rgb(192, 57, 43);
+			> a {
+				align-items: center;
+				color: $wcfHeaderMenuLink;
+				display: flex;
+				height: 50px;
+				padding: 0 10px;
+				
+				> span {
+					flex: 0 0 auto;
+				}
+				
+				> .boxMenuLinkOutstandingItems {
+					background-color: rgb(255, 255, 255);
+					color: rgb(192, 57, 43);
+				}
+			}
+			
+			> span {
+				cursor: default;
+			}
+			
+			&.active > a {
+				background: linear-gradient(to top, $wcfHeaderMenuBackground 0%, $wcfHeaderMenuBackgroundActive 50%);
+				color: $wcfHeaderMenuLinkActive;
+			}
+			
+			&:hover > a {
+				background: $wcfHeaderMenuBackgroundActive;
+				color: $wcfHeaderMenuLinkActive;
 			}
 		}
 		
-		> span {
-			cursor: default;
-		}
-		
-		&.active > a,
-		&:hover > a {
-			border-color: $wcfHeaderMenuBackgroundActive;
-			color: $wcfHeaderMenuLinkActive;
-		}
-	}
-	
-	> .boxMenuHasChildren {
-		position: relative;
-		
-		&:hover .boxMenuDepth1 {
-			visibility: visible;
-		}
-	}
-	
-	.boxMenuDepth1 {
-		background-color: $wcfHeaderMenuDropdownBackground;
-		position: absolute;
-		visibility: hidden;
-		
-		// align menu to the center of the menu item
-		left: 50%;
-		transform: translateX(-50%);
-		
-		// offset the menu to prevent the staircase effect when two elements with dark and light
-		// colors are right below each other; uses a transparent border rather than a margin to
-		// prevent losing the hover on the <li> causing the menu to collapse when the cursor is
-		// right between the menu item and the menu itself
-		background-clip: padding-box;
-		border-top: 15px solid transparent;
-		
-		@include wcfFontDefault;
-		
-		&::before {
-			content: "";
-			border: 10px solid transparent;
-			border-bottom-color: $wcfHeaderMenuDropdownBorder;
-			border-top-width: 0;
-			left: calc(50% - 10px);
-			position: absolute;
-			top: -10px;
-		}
-		
-		&::after {
-			content: "";
-			border: 10px solid transparent;
-			border-bottom-color: $wcfHeaderMenuDropdownBackground;
-			border-top-width: 0;
-			left: calc(50% - 10px);
-			position: absolute;
-			top: -9px;
+		> .boxMenuHasChildren {
+			position: relative;
+			
+			&:hover .boxMenuDepth1 {
+				visibility: visible;
+			}
 		}
 		
-		> li {
-			// the code below mimics the border surrounding the list element
-			// as seen for similar elements such as dropdowns; we cannot use
-			// the list border because the top border is abused to visually
-			// push down the list w/o triggering a "hover-out" on the menu item
+		.boxMenuDepth1 {
 			background-color: $wcfHeaderMenuDropdownBackground;
-			border: 1px solid $wcfHeaderMenuDropdownBorder;
-			border-width: 0 1px;
+			padding: 5px 0;
+			position: absolute;
+			visibility: hidden;
 			
-			&:first-child {
-				border-top-width: 1px;
-				padding-top: 3px;
-			}
+			@include wcfFontDefault;
 			
-			&:last-child {
-				border-bottom-width: 1px;
-				padding-bottom: 3px;
+			> li {
+				
+				> a {
+					color: $wcfHeaderMenuDropdownLink;
+				}
+				
+				> a,
+				> span {
+					display: block;
+					padding: 7px 20px;
+					white-space: nowrap;
+				}
+				
+				&.active > a,
+				> a:hover {
+					background-color: $wcfHeaderMenuDropdownBackgroundActive;
+					color: $wcfHeaderMenuDropdownLinkActive;
+					text-decoration: none;
+				}
 			}
-			
+		}
+		
+		.boxMenuDepth2 > li {
 			> a {
 				color: $wcfHeaderMenuDropdownLink;
-			}
-			
-			> a,
-			> span {
 				display: block;
-				padding: 7px 20px;
+				padding: 5px 20px 5px 40px;
 				white-space: nowrap;
 			}
 			
@@ -182,85 +140,91 @@
 			}
 		}
 	}
-	
-	.boxMenuDepth2 > li {
-		> a {
-			color: $wcfHeaderMenuDropdownLink;
-			display: block;
-			padding: 5px 20px 5px 40px;
-			white-space: nowrap;
-		}
+}
+
+@include large-screen-only {
+	.pageHeader:not(.sticky) .mainMenu {
+		background-color: $wcfHeaderMenuBackground;
+		position: relative;
 		
-		&.active > a,
-		> a:hover {
-			background-color: $wcfHeaderMenuDropdownBackgroundActive;
-			color: $wcfHeaderMenuDropdownLinkActive;
-			text-decoration: none;
+		/* The `box-shadow` and the `::before` are used to create a full-width
+		   color stripe that matches the height of the main menu. This trick is
+		   used to allows us to have all elements in the header share a common
+		   ancestor in order to easily move elements with flexbox' `order` property.
+		   
+		   The `box-shadow` is a neat hack because an `::after` element would
+		   increase the page width unless we set `overflow: hidden` to the entire
+		   page header which is bad for multiple reasons. */
+		box-shadow: 900px 0 0 0 $wcfHeaderMenuBackground;
+		
+		&::before {
+			background-color: $wcfHeaderMenuBackground;
+			bottom: 0;
+			content: "";
+			left: -100%;
+			position: absolute;
+			top: 0;
+			width: 100%;
 		}
 	}
 }
 
 /* user panel */
-.userPanel  > ul {
-	display: flex;
-	justify-content: flex-end;
+.userPanel {
+	flex: 0 0 auto;
 	
-	> li {
-		align-items: center;
+	> ul {
 		display: flex;
-		flex: 0 auto;
-		
-		/* margin between items, do not use the inner elements (such as a contained <a>) for
-		   this as it causes the last item to be of uneven size compared to all other items */
-		margin-left: 10px;
-		
-		&:not(:last-child) {
-			margin-right: 10px;
-		}
+		justify-content: flex-end;
 		
-		> a {
+		> li {
+			align-items: center;
+			display: flex;
 			flex: 0 auto;
-			position: relative;
 			
-			/* set icon color */
-			> .icon {
-				color: $wcfHeaderLink;
-			}
-			&:hover {
+			> a {
+				align-items: center;
+				color: $wcfHeaderMenuLink;
+				display: flex;
+				flex: 0 0 auto;
+				height: 50px;
+				padding: 0 10px;
+				position: relative;
+				
+				/* set icon color */
 				> .icon {
-					color: $wcfHeaderLinkActive;
+					color: inherit;
+				}
+				
+				/* hide icon label */
+				> span:not(.icon):not(.badge) {
+					display: none;
+				}
+				
+				/* special styling for update badge */
+				> span.badgeUpdate {
+					box-shadow: -1px 2px 3px rgba(0, 0, 0, .3), inset 0 2px 5px rgba(225, 225, 225, .3);
+					left: 16px;
+					position: absolute;
+					top: -5px;
 				}
 			}
 			
-			/* hide icon label */
-			> span:not(.icon):not(.badge) {
-				display: none;
+			&.open > a {
+				background: linear-gradient(to top, $wcfHeaderMenuBackground 0%, $wcfHeaderMenuBackgroundActive 50%);
+				color: $wcfHeaderMenuLinkActive;
 			}
 			
-			/* special styling for update badge */
-			> span.badgeUpdate {
-				box-shadow: -1px 2px 3px rgba(0, 0, 0, .3), inset 0 2px 5px rgba(225, 225, 225, .3);
-				left: 16px;
-				position: absolute;
-				top: -5px;
+			&:hover > a {
+				background: $wcfHeaderMenuBackgroundActive;
+				color: $wcfHeaderMenuLinkActive;
 			}
-		}
-		
-		/* ringing animation for notification icon */
-		&#userNotifications:not([data-count="0"]) { 
-			> a > .icon {
-				animation: fa-bell-ring 5s ease 10s 6;
-				transform-origin: 50% 0;
-			}
-		}
-		
-		/* hover effect for user menu button */
-		&#userMenu {
-			> a {
-				&:hover {
-					> img {
-						box-shadow: 0 0 0 2px $wcfHeaderLink;
-					}
+			
+			/* ringing animation for notification icon */
+			&#userNotifications:not([data-count="0"]) {
+				> a > .icon {
+					animation: fa-bell-ring 5s ease 10s 6;
+					transform-origin: 50% 0;
 				}
 			}
 		}
@@ -270,7 +234,9 @@
 /* SEARCH AREA */
 .pageHeaderSearch {
 	@include large-screen-only {
-		margin-bottom: 15px;
+		align-self: flex-start;
+		flex: 0 0 50%;
+		margin-bottom: 30px;
 		text-align: right;
 		
 		.pageHeaderSearchLabel {
diff --git a/wcfsetup/install/files/style/layout/pageHeaderSticky.scss b/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
index 64e5b427f1..b0ec7b7213 100644
--- a/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
+++ b/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
@@ -9,10 +9,8 @@
 	}
 	
 	.pageHeader.sticky {
-		flex-wrap: nowrap;
-		
 		> div {
-			background-color: $wcfHeaderBackground;
+			background-color: $wcfHeaderMenuBackground;
 			box-shadow: 0 0 10px rgba(0, 0, 0, .6);
 			left: 0;
 			position: fixed;
@@ -23,6 +21,7 @@
 		
 		
 		.layoutBoundary {
+			flex-wrap: nowrap;
 			min-height: 50px;
 			
 			// remove padding, the vertical alignment is done using `align-items`
@@ -43,6 +42,8 @@
 		}
 		
 		.pageHeaderLogo {
+			display: none;
+			flex: 0 0 auto;
 			margin-bottom: 0;
 			order: 1;
 			
@@ -56,13 +57,11 @@
 		}
 		
 		.mainMenu {
+			flex: 1 1 auto;
+			margin-right: 20px;
 			order: 2;
-			margin: 0 20px;
 			
 			.boxMenu {
-				background-color: $wcfHeaderBackground;
-				padding-bottom: 5px;
-				
 				> li > a {
 					align-items: center;
 					display: flex;
@@ -79,11 +78,13 @@
 		}
 		
 		.userPanel {
+			flex: 0 0 auto;
 			margin-left: 10px;
 			order: 4;
 		}
 		
 		.pageHeaderSearch {
+			flex: 0 0 auto;
 			margin-bottom: 0;
 			order: 3;
 			
diff --git a/wcfsetup/install/files/style/ui/dropdownInteractive.scss b/wcfsetup/install/files/style/ui/dropdownInteractive.scss
index 97bdcf199f..df2daf285e 100644
--- a/wcfsetup/install/files/style/ui/dropdownInteractive.scss
+++ b/wcfsetup/install/files/style/ui/dropdownInteractive.scss
@@ -38,7 +38,7 @@
 		}
 		
 		&.left {
-			left: 5px;
+			left: 15px;
 			
 			> span {
 				left: -10px;
@@ -46,7 +46,7 @@
 		}
 		
 		&.right {
-			right: 5px;
+			right: 15px;
 			
 			> span {
 				right: -10px;