Merge pull request #2254 from bradx3/fix_composer_padding

BUGFIX: adjust page padding when composer view open
This commit is contained in:
Sam 2014-04-11 10:10:48 +10:00
commit e770112cf5

View file

@ -75,7 +75,7 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
var replyControl = $('#reply-control'); var replyControl = $('#reply-control');
var h = replyControl.height() || 0; var h = replyControl.height() || 0;
var sizePx = "" + h + "px"; var sizePx = "" + h + "px";
$('.topic-area').css('padding-bottom', sizePx); $('#main-outlet').css('padding-bottom', sizePx);
$('.composer-popup').css('bottom', sizePx); $('.composer-popup').css('bottom', sizePx);
}); });
}.observes('model.composeState'), }.observes('model.composeState'),
@ -438,6 +438,7 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
}, },
childWillDestroyElement: function() { childWillDestroyElement: function() {
$('#main-outlet').css('padding-bottom', 0);
this._unbindUploadTarget(); this._unbindUploadTarget();
}, },