From 32d6d2a94eba69b5f2985e1390d7f4450890faec Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Wed, 4 Nov 2015 13:11:15 -0500
Subject: [PATCH] [ticket/12649] Restore missing css and fix html file

PHPBB3-12649
---
 phpBB/styles/prosilver/template/display_options.html | 5 ++++-
 phpBB/styles/prosilver/theme/bidi.css                | 4 ++++
 phpBB/styles/prosilver/theme/common.css              | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html
index d0f37f4daa..d1ec3dcef1 100644
--- a/phpBB/styles/prosilver/template/display_options.html
+++ b/phpBB/styles/prosilver/template/display_options.html
@@ -1,5 +1,8 @@
 <div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools">
-	<span title="{L_SORT_OPTIONS}" class="button icon-button sort-icon dropdown-trigger dropdown-select"></span>
+	<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select">
+		<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i>
+		<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>
+	</span>
 	<div class="dropdown hidden">
 		<div class="pointer"><div class="pointer-inner"></div></div>
 		<div class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 767e37f785..fc2cd3e29a 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -88,6 +88,10 @@
 
 /* Dropdown menu
 ---------------------------------------- */
+.rtl .dropdown-container.topic-tools, .rtl .dropdown-container-left {
+	float: right;
+}
+
 .rtl .dropdown li {
 	text-align: right;
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index c4005d45bf..e5a147f034 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -391,6 +391,10 @@ ul.linklist.bulletin > li.no-bulletin:before {
 	top: auto;
 }
 
+.dropdown-container.topic-tools {
+	float: left;
+}
+
 .dropdown-up .dropdown {
 	top: auto;
 	bottom: 1.2em;