aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-04-02 20:01:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-04-02 20:01:47 +0200
commit335520fc45f1d7a907b9e7a1f2328ea294f6ad13 (patch)
treeb85b7a437751ff3d0d80f88a5dc21ad889724295 /phpBB
parent5fc92a03b2ed8e8aa8059f028e4d9527932259b9 (diff)
parent0b52eb229825f98bc947d2886f8644448a01d6fd (diff)
downloadforums-335520fc45f1d7a907b9e7a1f2328ea294f6ad13.tar
forums-335520fc45f1d7a907b9e7a1f2328ea294f6ad13.tar.gz
forums-335520fc45f1d7a907b9e7a1f2328ea294f6ad13.tar.bz2
forums-335520fc45f1d7a907b9e7a1f2328ea294f6ad13.tar.xz
forums-335520fc45f1d7a907b9e7a1f2328ea294f6ad13.zip
Merge pull request #3509 from cyberalien/ticket/13727
[ticket/13727] Fix JS that resizes breadcrumbs
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index aabc5679f6..5d17bf50d2 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -410,7 +410,13 @@ function parseDocument($container) {
// Function that checks breadcrumbs
function check() {
var height = $this.height(),
- width = $body.width();
+ width;
+
+ // Test max-width set in code for .navlinks above
+ width = parseInt($this.css('max-width'));
+ if (!width) {
+ width = $body.width();
+ }
maxHeight = parseInt($this.css('line-height'));
$links.each(function() {