mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-27 11:40:24 +02:00
Code Issues Releases Wiki Activity

Fix scrubber height adjustment

Browse Source
This commit is contained in:
Toby Zerner
2015-03-05 12:34:42 +10:30
parent 214a591268
commit 4d3d9b73a1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/ember/app/components/discussion/stream-scrubber.js
View File

@@ -167,7 +167,7 @@ export default Ember.Component.extend({
// Adjust the height of the scrollbar so that it fills the height of // Adjust the height of the scrollbar so that it fills the height of
// the sidebar and doesn't overlap the footer. // the sidebar and doesn't overlap the footer.
var scrollbar = view.$('.scrubber-scrollbar'); var scrollbar = view.$('.scrubber-scrollbar');
scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - $('#footer').outerHeight(true)); scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - parseInt($('#page').css('padding-bottom')));
}, },
windowWasScrolled: function(event) { windowWasScrolled: function(event) {

2
framework/core/ember/app/styles/flarum/layout.less
View File

@@ -384,7 +384,7 @@ body {
// right. // right.
@media @tablet, @desktop, @desktop-hd { @media @tablet, @desktop, @desktop-hd {
.global-page { .global-page {
padding-bottom: 150px; padding-bottom: 100px;
position: relative; position: relative;
} }
.global-footer { .global-footer {