Skip to content

Commit

Permalink
Fixed CSS issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
tonioo committed Apr 21, 2017
1 parent 44618c1 commit 61fe680
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
8 changes: 8 additions & 0 deletions modoboa_webmail/static/modoboa_webmail/css/webmail.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
}

#mailcontent {
position: absolute;
top: 0;
left: 0;
border: 0;
margin: 0;
padding: 0;
Expand Down Expand Up @@ -300,3 +303,8 @@ list {
margin: 0px;
}

#emailheaders {
position: absolute;
top: 0;
left: 0;
}
12 changes: 7 additions & 5 deletions modoboa_webmail/static/modoboa_webmail/js/webmail.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ Webmail.prototype = {

$("#listing").html(response.listing);

if (this.navobject.getparam("action") == "listmailbox") {
if (this.navobject.getparam('action') === 'listmailbox') {
this.setup_infinite_scroll(response);
} else {
this.disable_infinite_scroll();
Expand Down Expand Up @@ -1170,12 +1170,14 @@ Webmail.prototype = {
if (!$emailHeaders.length) {
return;
}
var top = $emailHeaders.offset().top + $emailHeaders.innerHeight();
$("#mailcontent").innerHeight($(window).height() - top);
var top = $emailHeaders.height();
$('#mailcontent').css({ top: top });
top += $emailHeaders.offset().top;
$('#mailcontent').innerHeight($(window).height() - top);
},

mark_callback: function(data) {
if (data.action == "read") {
if (data.action === "read") {
this.htmltable.current_selection().removeClass("unseen");
} else {
this.htmltable.current_selection().addClass("unseen");
Expand All @@ -1187,7 +1189,7 @@ Webmail.prototype = {

delete_callback: function(data) {
this.go_back_to_listing();
if (this.get_current_mailbox() != this.options.trash) {
if (this.get_current_mailbox() !== this.options.trash) {
$("a[name=totrash]").removeClass("disabled");
}
$("body").notify("success", data, 2000);
Expand Down

0 comments on commit 61fe680

Please sign in to comment.