diff options
| author | PayBas <contact@paybas.com> | 2014-06-01 19:08:07 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-05 09:59:36 +0200 |
| commit | 27c678125a0a9e74ef644fadaf0ff7ca448bca90 (patch) | |
| tree | d3875b14244e7eef4af3dc22b6f1921ae68e955c /phpBB | |
| parent | c47b546bf08775d215da4bd07e7a93cbc68b322f (diff) | |
| download | forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.gz forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.bz2 forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.xz forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.zip | |
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
Also removed outdated CSS
PHPBB3-12613
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 13 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/pagination.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 11 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 2 |
4 files changed, 12 insertions, 16 deletions
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; } |