diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-02 20:03:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-04-02 20:03:02 +0200 |
| commit | 8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d (patch) | |
| tree | 5b3731068f7e93a7bdf3cdcf7816bf90f857aa4c | |
| parent | eb7e6d7c23db65530a46dd62432039c19792d564 (diff) | |
| parent | 335520fc45f1d7a907b9e7a1f2328ea294f6ad13 (diff) | |
| download | forums-8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d.tar forums-8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d.tar.gz forums-8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d.tar.bz2 forums-8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d.tar.xz forums-8546ed0fbc15b9919fd51d3c5bb3688e31ae3d6d.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 8 |
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() { |