3 files changed, 8 insertions, 38 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index fa838fde19..9d4417154f 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -368,39 +368,6 @@ function parse_document(container)
 	});
 
 	/**
-	* Dropdowns
-	*/
-	container.find('.dropdown-container').each(function() {
-		var $this = $(this),
-			trigger = $this.find('.dropdown-trigger:first'),
-			contents = $this.find('.dropdown'),
-			options = {
-				direction: 'auto',
-				verticalDirection: 'auto'
-			},
-			data;
-
-		if (!trigger.length) {
-			data = $this.attr('data-dropdown-trigger');
-			trigger = data ? $this.children(data) : $this.children('a:first');
-		}
-
-		if (!contents.length) {
-			data = $this.attr('data-dropdown-contents');
-			contents = data ? $this.children(data) : $this.children('div:first');
-		}
-
-		if (!trigger.length || !contents.length) return;
-
-		if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up';
-		if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down';
-		if ($this.hasClass('dropdown-left')) options.direction = 'left';
-		if ($this.hasClass('dropdown-right')) options.direction = 'right';
-
-		phpbb.registerDropdown(trigger, contents, options);
-	});
-
-	/**
 	* Adjust HTML code for IE8 and older versions		
 	*/
 	if (oldBrowser) {
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 804fa5b2aa..1eb120ef3e 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -17,8 +17,8 @@
 	<ul class="linklist bulletin">
 	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 		<!-- IF S_NOTIFICATIONS_DISPLAY -->
-		<li class="small-icon icon-notification" data-skip-responsive="true">
-			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+		<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END}" data-skip-responsive="true">
+			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
 			<!-- INCLUDE notification_dropdown.html -->
 		</li>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 314e284155..d4cce2e2ae 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -156,10 +156,13 @@ function marklist(id, name, state)
 	<div id="menubar">
 		<table width="100%" cellspacing="0">
 		<tr>
-			<td class="genmed">
+			<td class="genmed dropdown-container">
 				<!-- IF S_NOTIFICATIONS_DISPLAY and not S_IS_BOT and S_USER_LOGGED_IN -->
-					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><img src="{T_THEME_PATH}/images/icon_mini_notification.gif" width="12" height="13" alt="*" /> {L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]</a>&nbsp;
-					<div id="notification_list" class="notification_list">
+					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger">
+						<img src="{T_THEME_PATH}/images/icon_mini_notification.gif" width="12" height="13" alt="*" />
+						{L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]
+					</a>&nbsp;
+					<div id="notification_list" class="notification_list dropdown">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
 							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>