From 3bfc9ccbc7472e2f000e70c7a9ab3a93dcbd30d7 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 31 May 2014 16:25:20 -0700
Subject: [PATCH] [ticket/12013] Update to use the new .button class.

PHPBB3-12013
---
 phpBB/styles/prosilver/template/jumpbox.html        | 5 ++---
 phpBB/styles/prosilver/template/viewtopic_body.html | 4 ++--
 phpBB/styles/prosilver/theme/buttons.css            | 8 ++++++--
 phpBB/styles/prosilver/theme/colours.css            | 4 ++++
 phpBB/styles/prosilver/theme/common.css             | 4 ++++
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 420fd62202..2ddc8423c6 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -11,10 +11,9 @@
 
 <!-- IF S_DISPLAY_JUMPBOX -->
 
-	<div class="dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-left dropdown-button-control">
-		<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger dropdown-select">
+	<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control">
+		<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger button dropdown-select">
 			<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->
-			<span></span>
 		</span>
 		<div class="dropdown hidden">
 			<div class="pointer"><div class="pointer-inner"></div></div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 0b54e6cb9b..f92c919e50 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -367,8 +367,8 @@
 <!-- INCLUDE jumpbox.html -->
 
 <!-- IF .quickmod -->
-	<div class="dropdown-container dropdown-container-right dropdown-up dropdown-left dropdown-button-control">
-		<span title="{L_QUICK_MOD}" class="dropdown-trigger dropdown-select">{L_QUICK_MOD}<span></span></span>
+	<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END} dropdown-up dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control">
+		<span title="{L_QUICK_MOD}" class="dropdown-trigger button dropdown-select">{L_QUICK_MOD}</span>
 		<div class="dropdown hidden">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index d0efee3934..6281b6f06a 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -21,8 +21,8 @@
 	vertical-align: bottom;
 }
 
-.icon-button.dropdown-select {
-	padding-right: 28px;
+.dropdown-select {
+	padding-right: 24px;
 }
 
 .icon-button:before {
@@ -35,6 +35,10 @@
 	width: 12px;
 }
 
+.dropdown-select.icon-button:before {
+	margin-right: 4px;
+}
+
 .dropdown-select:after {
 	background-position: -103px 10px;
 	border-left: 1px solid;
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 1341c4def2..606a788036 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -614,6 +614,10 @@ Colours and backgrounds for buttons.css
 	color: #D31141;
 }
 
+.dropdown-select, .dropdown-select:visited {
+	color: #536482;
+}
+
 .button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select {
 	border-color: #0a8ed0;
 	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index b4685a6312..19cd4e3139 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -481,6 +481,10 @@ ul.linklist.bulletin > li.no-bulletin:before {
 	float: right;
 }
 
+.dropdown-container-left {
+	float: left;
+}
+
 .nojs .dropdown-container:hover .dropdown {
 	display: block !important;
 }