aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVjacheslav Trushkin <cyberalien@gmail.com>2013-10-19 22:30:03 +0300
committerVjacheslav Trushkin <cyberalien@gmail.com>2013-10-19 22:30:03 +0300
commit2c15b653cc636d8e69ed94ffb7d442b32da65287 (patch)
tree2ed58440b68018a578d7b5a01ef0ef0dd258fbb0
parent7b972204ae434d929f56f7aaed72bf81464551b4 (diff)
downloadforums-2c15b653cc636d8e69ed94ffb7d442b32da65287.tar
forums-2c15b653cc636d8e69ed94ffb7d442b32da65287.tar.gz
forums-2c15b653cc636d8e69ed94ffb7d442b32da65287.tar.bz2
forums-2c15b653cc636d8e69ed94ffb7d442b32da65287.tar.xz
forums-2c15b653cc636d8e69ed94ffb7d442b32da65287.zip
[ticket/11552] Tweaks to responsive navigation
PHPBB3-11552
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js4
-rw-r--r--phpBB/styles/prosilver/template/overall_header.html2
-rw-r--r--phpBB/styles/prosilver/theme/common.css4
3 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index f5460927a5..d710d947cd 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -468,7 +468,7 @@ function insert_single_user(formId, user)
});
// Responsive breadcrumbs
- $('.breadcrumbs:not(.skip-responsive)').each(function() {
+ $('.breadcrumbs:not(.skip-responsive, .linklist .breadcrumbs)').each(function() {
var $this = $(this),
$body = $('body'),
links = $this.find('.crumb'),
@@ -606,7 +606,7 @@ function insert_single_user(formId, user)
links = $this.children().not('.skip-responsive'),
html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><ul class="responsive-popup" style="display:none;" /></li>',
// List of items that should be hidden last
- filterString = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read',
+ filterString = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .breadcrumbs',
filtered = links.filter(filterString);
if (links.is('.rightside'))
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 5426b36294..4b86cde10f 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -155,7 +155,7 @@
</ul>
<!-- ENDIF -->
- <ul class="linklist rightside">
+ <ul class="linklist rightside<!-- IF S_IS_BOT or not S_USER_LOGGED_IN --> fullwidth<!-- ENDIF -->">
<!-- EVENT overall_header_navigation_prepend -->
<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
<!-- IF not S_IS_BOT -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 376c951564..f95fae45e4 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -389,6 +389,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:before {
max-width: 48%;
}
+.hasjs ul.linklist.fullwidth {
+ max-width: none;
+}
+
/* Bulletin icons for list items
----------------------------------------*/
ul.linklist.bulletin li:before {