diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-10-22 22:03:43 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-10-24 18:36:16 +0300 |
| commit | 1638ff3cba881eb7bce2ffc29946db0644feaff2 (patch) | |
| tree | be202332b45225ec67c018f83ad5d730594b0196 /phpBB/styles/prosilver/template | |
| parent | d11e62930a604fe480fcfa5f2e06ddd421087375 (diff) | |
| download | forums-1638ff3cba881eb7bce2ffc29946db0644feaff2.tar forums-1638ff3cba881eb7bce2ffc29946db0644feaff2.tar.gz forums-1638ff3cba881eb7bce2ffc29946db0644feaff2.tar.bz2 forums-1638ff3cba881eb7bce2ffc29946db0644feaff2.tar.xz forums-1638ff3cba881eb7bce2ffc29946db0644feaff2.zip | |
[ticket/11956] Arrow for responsive popup
PHPBB3-11956
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 8cd4880914..2e0cf7bfea 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -729,7 +729,7 @@ function parse_document(container) filterSkip = '.breadcrumbs, .skip-responsive', filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon', links = $this.children().not(filterSkip), - html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link"> </a><ul class="responsive-popup" style="display:none;" /></li>', + html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link"> </a><div class="popup-pointer" style="display: none;"><div class="popup-pointer-inner" /></div><ul class="responsive-popup" style="display:none;" /></li>', filterLastList = links.filter(filterLast); if (links.is('.rightside')) @@ -744,6 +744,7 @@ function parse_document(container) var toggle = $this.children('.responsive-menu'), toggleLink = toggle.find('a.responsive-menu-link'), menu = toggle.find('ul.responsive-popup'), + toggleItems = toggle.find('ul.responsive-popup, div.popup-pointer'), lastWidth = false, compact = false, responsive = false, @@ -782,7 +783,7 @@ function parse_document(container) // Nothing to resize if block's height is not bigger than tallest element's height if ($this.height() <= maxHeight) { toggle.removeClass('visible'); - menu.hide(); + toggleItems.hide(); return; } @@ -798,7 +799,7 @@ function parse_document(container) if ($this.height() <= maxHeight) { toggle.removeClass('visible'); - menu.hide(); + toggleItems.hide(); return; } @@ -809,7 +810,7 @@ function parse_document(container) if (!copied) { if (menu.parents().is('.rightside')) { - menu.addClass('responsive-rightside'); + toggle.addClass('responsive-rightside'); } menu.append(links.clone(true)); menu.find('li.leftside, li.rightside').removeClass('leftside rightside'); @@ -846,10 +847,10 @@ function parse_document(container) if (!responsive) return; if (!toggle.hasClass('visible')) { // Hide other popups - $('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide(); + $('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide(); } toggle.toggleClass('visible'); - menu.toggle(); + toggleItems.toggle(); }); check(); @@ -952,7 +953,7 @@ function parse_document(container) $('#phpbb').click(function(e) { var parents = $(e.target).parents(); if (!parents.is('.responsive-menu.visible')) { - $('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide(); + $('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide(); } if (!parents.is('.responsive-tab')) { $('.responsive-tabs').hide(); diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 9a08c0f5ac..3ef264259f 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -103,7 +103,7 @@ <li class="icon-notification skip-responsive"> <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> <div id="notification_list" class="notification_list"> - <div class="pointer"><div class="pointer_inner"></div></div> + <div class="popup-pointer"><div class="popup-pointer-inner"></div></div> <div class="header"> {L_NOTIFICATIONS} <span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span> |