harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix calculation of content height with margins

Browse Source
This commit is contained in:
Mario Vavti 2015-09-17 14:14:01 +02:00
parent f2104b0a5a
commit b7e953f50e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/readmore.js/readmore.js
View File

@ -62,7 +62,7 @@
function setBoxHeights(element) { function setBoxHeights(element) {
var el = element, var el = element,
expandedHeight = el.outerHeight(), expandedHeight = el.outerHeight(true),
cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
defaultHeight = element.data('defaultHeight'); defaultHeight = element.data('defaultHeight');

7
view/css/conversation.css
View File

@ -122,11 +122,14 @@ a.wall-item-name-link {
overflow: auto; overflow: auto;
} }
.wall-item-content h1, .wall-item-content h2 { .wall-item-content h1,
.wall-item-content h2 {
font-size: 1.319em; font-size: 1.319em;
} }
.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { .wall-item-title h3,
.wall-item-content h3,
.wall-item-content h4 {
font-size: 1.112em; font-size: 1.112em;
} }

2
view/js/main.js
View File

@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
function collapseHeight() { function collapseHeight() {
$(".wall-item-body, .directory-collapse").each(function() { $(".wall-item-content, .directory-collapse").each(function() {
var orgHeight = $(this).height(); var orgHeight = $(this).height();
if(orgHeight > divmore_height + 10) { if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) { if(! $(this).hasClass('divmore')) {