From 3b89fb954188e8ac8ef676acecace6357400e393 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 18 Apr 2016 10:18:42 +0200
Subject: [PATCH] Various style improvements

---
 wcfsetup/install/files/acp/style/layout.scss  |  2 +-
 .../files/acp/templates/pageHeaderUser.tpl    |  6 +--
 .../files/style/layout/pageHeader.scss        |  5 +-
 .../files/style/ui/dropdownInteractive.scss   | 46 ++-----------------
 4 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss
index 6693cf1aa1..9e3b8a3f19 100644
--- a/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@ -56,7 +56,7 @@
 			.pageHeaderSearchInput {
 				border-width: 0 !important;
 				height: 50px;
-				width: 300px;
+				width: 300px !important;
 			}
 		}
 		
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 9ba2ce34da..162f4db506 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -4,7 +4,7 @@
 			{if PACKAGE_ID}
 				<li id="userMenu" class="dropdown">
 					<a class="dropdownToggle" data-toggle="userMenu">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</a>
-					<ul class="dropdownMenu">
+					<ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
 						{* TODO: this was copied straight from the frontend *}
 						<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}" class="box32">
 								<div>{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
@@ -26,7 +26,7 @@
 				
 				<li id="jumpToPage" class="dropdown">
 					<a href="{link forceFrontend=true}{/link}" class="dropdownToggle" data-toggle="jumpToPage"><span class="icon icon32 fa-home"></span> <span>{lang}wcf.global.jumpToPage{/lang}</span></a>
-					<ul class="dropdownMenu">
+					<ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
 						{foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem}
 							{if !$_menuItem->getMenuItem()->parentItemID && $_menuItem->getMenuItem()->getPage()}
 								<li><a href="{$_menuItem->getMenuItem()->getPage()->getLink()}">{$_menuItem->getMenuItem()->getPage()}</a></li>
@@ -45,7 +45,7 @@
 			<li id="woltlab" class="dropdown">
 				<a class="dropdownToggle" data-toggle="woltlab"><span class="icon icon32 fa-info"></span> <span>WoltLab&reg;</span></a>
 				
-				<ul class="dropdownMenu">
+				<ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
 					<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://www.woltlab.com"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.website{/lang}</a></li>
 					<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://community.woltlab.com"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.forums{/lang}</a></li>
 					<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://www.woltlab.com/ticket-add/"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.tickets{/lang}</a></li>
diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss
index c1b005a3b3..e91bd20aac 100644
--- a/wcfsetup/install/files/style/layout/pageHeader.scss
+++ b/wcfsetup/install/files/style/layout/pageHeader.scss
@@ -1,7 +1,3 @@
-/* @TODO */
-.interactiveDropdown { display: none; }
-/* @TODO END */
-
 .pageHeaderContainer {
 	background-color: $wcfHeaderBackground;
 	color: $wcfHeaderText;
@@ -219,6 +215,7 @@
 				}
 			}
 			
+			&.dropdownOpen > a,
 			&.open > a {
 				background: linear-gradient(to top, $wcfHeaderMenuBackground 0%, $wcfHeaderMenuBackgroundActive 50%);
 				color: $wcfHeaderMenuLinkActive;
diff --git a/wcfsetup/install/files/style/ui/dropdownInteractive.scss b/wcfsetup/install/files/style/ui/dropdownInteractive.scss
index df2daf285e..fa9d750fdc 100644
--- a/wcfsetup/install/files/style/ui/dropdownInteractive.scss
+++ b/wcfsetup/install/files/style/ui/dropdownInteractive.scss
@@ -5,10 +5,9 @@
 /* styling for interactive dropdowns (currently only used in the user panel) */
 .interactiveDropdown {
 	background-color: $wcfContentBackground;
-	border: 1px solid $wcfDropdownBorder;
-	box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, .2);
+	border-radius: 2px;
+	box-shadow: 0 2px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
 	color: $wcfContentText;
-	display: block;
 	pointer-events: all;
 	position: absolute;
 	visibility: hidden;
@@ -18,52 +17,13 @@
 	left: -200%;
 	
 	> .elementPointer {
-		border-color: $wcfDropdownBorder transparent;
-		border-style: solid;
-		border-width: 0 10px 10px;
-		content: "";
-		display: block;
-		position: absolute;
-		z-index: 100;
-		
-		> span {
-			border-color: $wcfSidebarBackground transparent;
-			border-style: solid;
-			border-width: 0 10px 10px;
-			content: "";
-			display: block;
-			position: absolute;
-			top: 1px;
-			z-index: 101;
-		}
-		
-		&.left {
-			left: 15px;
-			
-			> span {
-				left: -10px;
-			}
-		}
-		
-		&.right {
-			right: 15px;
-			
-			> span {
-				right: -10px;
-			}
-		}
+		display: none;
 	}
 	
 	&.interactiveDropdownUserMenu > .interactiveDropdownItemsContainer {
 		overflow: visible;
 		max-height: none;
 	}
-	
-	@include small-screen-only {
-		> .elementPointer {
-			display: none;
-		}
-	}
 }
 
 /* drop down header */
-- 
2.20.1