diff --git a/media/css/seahub.css b/media/css/seahub.css index 71a2e90a61..73bf9c77fd 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1550,6 +1550,7 @@ textarea:-moz-placeholder {/* for FF */ } .msg { word-wrap: break-word; + padding:1px 0; /* to fix 'top border missing' when only 1 discussion & no scrollbar in chrome */ margin:15px 0 20px; } .msg .txt { diff --git a/templates/snippets/bottom_bar.html b/templates/snippets/bottom_bar.html index 1e19674245..f91761153c 100644 --- a/templates/snippets/bottom_bar.html +++ b/templates/snippets/bottom_bar.html @@ -7,7 +7,7 @@ $('#footer').addClass('hide'); {% if groups %} function getAndHandleDiscussions(data_html) { - $('#discussions-to-grp').html(data_html).css({'max-height':$(window).height() * 0.9 - $('#bottom-bar').height() - $('#discuss-to-group-caret').height() - $('#discuss-to-group-form').outerHeight()}).removeClass('hide'); + $('#discussions-to-grp').html(data_html).css({'max-height': parseInt($(window).height() * 0.9 - $('#bottom-bar').height() - $('#discuss-to-group-caret').height() - $('#discuss-to-group-form').outerHeight())}).removeClass('hide'); // 'parseInt' to fix '.msg-main top border missing when the ul's max-height is xxx.5px' {% include 'group/msg_js.html' %} } $('#discuss').click(function() {