diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js index b6bed7f47..66b2c65b0 100644 --- a/app/assets/javascripts/layout.js +++ b/app/assets/javascripts/layout.js @@ -1,4 +1,13 @@ $(function() { - var offset = $("aside#sidebar").offset().top + $("aside#sidebar").height(); - $("#page-footer").css({"position": "absolute", "top": offset, "width": "100%", "height": "5em"}); + var $sidebar = $("#sidebar"); + var $content = $("#content"); + var sidebar_offset = $sidebar.offset().top + $sidebar.height(); + var content_offset = $content.offset().top + $content.height(); + var offset = null; + if (sidebar_offset > content_offset) { + offset = sidebar_offset; + } else { + offset = content_offset; + } + $("#page-footer").css({"position": "absolute", "top": offset, "width": "100%", "height": "3em"}); }); diff --git a/app/assets/stylesheets/specific/favorites.css.scss b/app/assets/stylesheets/specific/favorites.css.scss index f9bd890f0..7b826a4c9 100644 --- a/app/assets/stylesheets/specific/favorites.css.scss +++ b/app/assets/stylesheets/specific/favorites.css.scss @@ -4,4 +4,13 @@ div#c-favorites { section#content > h1 { font-size: $h3_size; } + + div#posts { + margin-left: 0; + margin-right: 6.5em; + } + + #content { + margin-left: 15em; + } }