diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-09-17 14:14:01 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-09-17 14:14:01 +0200 |
| commit | b7e953f50eb8c2dc77ab95a712e5b12ce54c28b8 (patch) | |
| tree | a54566974deaf9e78ae6acf03eea57e1c5087fc3 | |
| parent | f2104b0a5af6ad54ba67c0944c3e2f7548ea882f (diff) | |
| download | volse-hubzilla-b7e953f50eb8c2dc77ab95a712e5b12ce54c28b8.tar.gz volse-hubzilla-b7e953f50eb8c2dc77ab95a712e5b12ce54c28b8.tar.bz2 volse-hubzilla-b7e953f50eb8c2dc77ab95a712e5b12ce54c28b8.zip | |
fix calculation of content height with margins
| -rw-r--r-- | library/readmore.js/readmore.js | 2 | ||||
| -rw-r--r-- | view/css/conversation.css | 11 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index e790ceb76..d4c1cf723 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -62,7 +62,7 @@ function setBoxHeights(element) { var el = element, - expandedHeight = el.outerHeight(), + expandedHeight = el.outerHeight(true), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); diff --git a/view/css/conversation.css b/view/css/conversation.css index 7d4930aac..e409cf4cf 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -122,12 +122,15 @@ a.wall-item-name-link { overflow: auto; } -.wall-item-content h1, .wall-item-content h2 { - font-size: 1.319em; +.wall-item-content h1, +.wall-item-content h2 { + font-size: 1.319em; } -.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { - font-size: 1.112em; +.wall-item-title h3, +.wall-item-content h3, +.wall-item-content h4 { + font-size: 1.112em; } .wall-item-content img { diff --git a/view/js/main.js b/view/js/main.js index 5fe778488..a60b47541 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -615,7 +615,7 @@ function updateConvItems(mode,data) { function collapseHeight() { - $(".wall-item-body, .directory-collapse").each(function() { + $(".wall-item-content, .directory-collapse").each(function() { var orgHeight = $(this).height(); if(orgHeight > divmore_height + 10) { if(! $(this).hasClass('divmore')) { |