From 27c678125a0a9e74ef644fadaf0ff7ca448bca90 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 1 Jun 2014 19:08:07 +0200
Subject: [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing

Also removed outdated CSS

PHPBB3-12613
---
 phpBB/styles/prosilver/template/forum_fn.js     | 13 +++++++------
 phpBB/styles/prosilver/template/pagination.html |  2 +-
 phpBB/styles/prosilver/theme/colours.css        | 11 +++--------
 phpBB/styles/prosilver/theme/common.css         |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index a4d4c7527c..7041c6021c 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -367,13 +367,14 @@ function parse_document(container)
      	}
 	});
 
-	container.find('.pagination-trigger').click(function() {
+	container.find('.pagination .dropdown-trigger').click(function() {
 		$dropdown_container = $(this).parent();
-		
-		if (!$dropdown_container.hasClass('dropdown-visible')) {
-			$input = $dropdown_container.find("input.inputbox");
-			setTimeout(function() { $input.focus(); },100);
-		}
+		// Wait a little bit to make sure the dropdown has activated
+		setTimeout(function() { 
+			if ($dropdown_container.hasClass('dropdown-visible')) {
+				$dropdown_container.find("input.inputbox").focus();
+			}
+		},100);
 	});
 
 	/**
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 080a946ffd..8f137eb8ef 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,7 +1,7 @@
 <ul>
 <!-- IF BASE_URL -->
 	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
-		<a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a>
+		<a href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a>
 		<div class="dropdown hidden">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 88a934594c..f225ff0a74 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -159,7 +159,7 @@ dl.details dd {
 /* Pagination
 ---------------------------------------- */
 
-.pagination li a, .pagination li a:link, .pagination li a:visited {
+.pagination li a {
 	color: #5C758C;
 	background-color: #ECEDEE;
 	border-color: #B4BAC0;
@@ -176,18 +176,13 @@ dl.details dd {
 	border-color: #4692BF;
 }
 
-.pagination li a:hover, .pagination .active a:hover {
+.pagination li a:hover, .pagination .active a:hover,
+.pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { {
 	border-color: #368AD2;
 	background-color: #368AD2;
 	color: #FFFFFF;
 }
 
-.pagination li a:active, .pagination li.active a:active {
-	color: #5C758C;
-	background-color: #ECEDEE;
-	border-color: #B4BAC0;
-}
-
 .pagination li.next a, .pagination li.previous a, .pagination li.page-jump a {
 	background-image: url("./images/icons_pagination.png");
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3c7d3c5adc..5d0c024af4 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -884,7 +884,7 @@ li.pagination ul {
 	background-repeat: no-repeat;
 }
 
-.pagination li.page-jump a:hover { background-position: 0 -18px; }
+.pagination li.page-jump a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background-position: 0 -18px; }
 .pagination li.next a:hover { background-position: -50px -18px; }
 .pagination li.previous a:hover { background-position: -30px -18px; }
 
-- 
cgit v1.2.1