[ticket/12649] Cleanup code after recent merges

PHPBB3-12649
phpbb · Oct 8, 2014 · 801f201 · 801f201
1 parent 52499a0
commit 801f201
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 36 deletions.
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html
@@ -1,4 +1,4 @@
-<div class="dropdown-container dropdown-button-control sort-tools">
+<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>
 	<div class="dropdown hidden">
 		<div class="pointer"><div class="pointer-inner"></div></div>

diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
@@ -88,11 +88,6 @@
 
 /* Dropdown menu
 ---------------------------------------- */
-.rtl .dropdown-container.topic-tools,
-.rtl .dropdown-container.sort-tools {
-	float: right;
-}
-
 .rtl .dropdown li {
 	text-align: right;
 }

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
@@ -40,7 +40,7 @@
 }
 
 .dropdown-select:after {
-	background-position: -143px 10px;
+	background-position: -103px 10px;
 	border-left: 1px solid;
 	content: '';
 	position: absolute;
@@ -51,7 +51,7 @@
 }
 
 .dropdown-visible .dropdown-select:after, .nojs .dropdown-container:hover .dropdown-select:after {
-	background-position: -143px -10px;
+	background-position: -103px -10px;
 }
 
 .buttons, .buttons .button {
@@ -85,7 +85,7 @@
 	font-size: 0;
 }
 
-.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before {
+.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before, .sort-icon:before {
 	background-position: -80px 0;
 	height: 16px;
 	margin-top: 2px;
@@ -95,15 +95,9 @@
 .dropdown-visible .tools-icon:before,
 .nojs .dropdown-container:hover .tools-icon:before			{ background-position: -80px -20px; }
 
-.sort-icon:before {
-	background-position: -120px 0;
-	height: 16px;
-	margin-top: 2px;
-	width: 16px;
-}
-
+.sort-icon:before											{ background-position: -265px 0; }
 .dropdown-visible .sort-icon:before,
-.nojs .dropdown-container:hover .sort-icon:before			{ background-position: -120px -20px; }
+.nojs .dropdown-container:hover .sort-icon:before			{ background-position: -265px -20px; }
 
 .search-icon:before											{ background-position: -245px 0; }
 .search-icon:hover:before									{ background-position: -245px -20px; }
@@ -226,20 +220,20 @@ ul.linklist.bulletin > li.small-icon:before {
 	margin-left: 0;
 }
 
-.quote-icon:before							{ background-position: -162px 0; }
-.quote-icon:hover:before					{ background-position: -162px -21px; }
-.edit-icon:before							{ background-position: -177px 0; }
-.edit-icon:hover:before						{ background-position: -177px -21px; }
-.warn-icon:before							{ background-position: -248px 0; }
-.warn-icon:hover:before						{ background-position: -248px -21px; }
-.delete-icon:before							{ background-position: -192px 0; }
-.delete-icon:hover:before					{ background-position: -192px -21px; }
-.report-icon:before							{ background-position: -205px 0; }
-.report-icon:hover:before					{ background-position: -205px -21px; }
-.info-icon:before							{ background-position: -215px 0; }
-.info-icon:hover:before						{ background-position: -215px -21px; }
-.button.responsive-menu-link:before			{ background-position: -231px 0; }
-.button.responsive-menu-link:hover:before	{ background-position: -231px -21px; }
+.quote-icon:before							{ background-position: -122px 0; }
+.quote-icon:hover:before					{ background-position: -122px -21px; }
+.edit-icon:before							{ background-position: -137px 0; }
+.edit-icon:hover:before						{ background-position: -137px -21px; }
+.warn-icon:before							{ background-position: -208px 0; }
+.warn-icon:hover:before						{ background-position: -208px -21px; }
+.delete-icon:before							{ background-position: -152px 0; }
+.delete-icon:hover:before					{ background-position: -152px -21px; }
+.report-icon:before							{ background-position: -165px 0; }
+.report-icon:hover:before					{ background-position: -165px -21px; }
+.info-icon:before							{ background-position: -175px 0; }
+.info-icon:hover:before						{ background-position: -175px -21px; }
+.button.responsive-menu-link:before			{ background-position: -191px 0; }
+.button.responsive-menu-link:hover:before	{ background-position: -191px -21px; }
 
 /* Responsive buttons in post body */
 .post-buttons .dropdown {

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
@@ -454,11 +454,6 @@ ul.linklist.bulletin > li.no-bulletin:before {
 	top: auto;
 }
 
-.dropdown-container.topic-tools,
-.dropdown-container.sort-tools {
-	float: left;
-}
-
 .dropdown-up .dropdown {
 	top: auto;
 	bottom: 1.2em;