aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js12
-rw-r--r--phpBB/styles/prosilver/theme/common.css14
2 files changed, 15 insertions, 11 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index b9604c3248..3b13211362 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -584,11 +584,6 @@ function parse_document(container)
lastWidth = false,
wrapped = false;
- // Test height by setting nowrap
- $this.css('white-space', 'nowrap');
- maxHeight = $this.height() + 1;
- $this.css('white-space', '');
-
// Set tooltips
$this.find('a').each(function() {
var $link = $(this);
@@ -601,6 +596,13 @@ function parse_document(container)
width = $body.width(),
link, i, j;
+ maxHeight = parseInt($this.css('line-height')) | 0;
+ links.each(function() {
+ if ($(this).height() > 0) {
+ maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+ }
+ });
+
if (height <= maxHeight) {
if (!wrapped || lastWidth === false || lastWidth >= width) {
lastWidth = width;
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3605b9e1a4..84aea8212c 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -372,7 +372,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
font-size: 16px;
position: relative;
width: 16px;
- line-height: 16px;
+ line-height: 16.5px;
text-decoration: none;
}
@@ -533,20 +533,22 @@ ul.linklist.bulletin li.no-bulletin:before {
/* Responsive breadcrumbs
----------------------------------------*/
+.breadcrumbs .crumb {
+ word-wrap: normal;
+}
+
.breadcrumbs .crumb a {
display: inline-block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
vertical-align: bottom;
+ overflow: hidden;
}
.breadcrumbs.wrapped .crumb a { letter-spacing: -.3px; }
.breadcrumbs.wrapped .crumb.wrapped-medium a { letter-spacing: -.4px; }
.breadcrumbs.wrapped .crumb.wrapped-tiny a { letter-spacing: -.5px; }
-.breadcrumbs .crumb.wrapped a {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
.breadcrumbs .crumb.wrapped-max a { max-width: 120px; }
.breadcrumbs .crumb.wrapped-wide a { max-width: 100px; }
.breadcrumbs .crumb.wrapped-medium a { max-width: 80px; }