Skip to content

E
edx-platform
Commit 1caef344 by Matthew Mongeau
Options

Fix sidebar alignment

parent a51ae8cf
Showing with 16 additions and 16 deletions
lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
...@@ -23,32 +23,32 @@ class @DiscussionThreadListView extends Backbone.View ...@@ -23,32 +23,32 @@ class @DiscussionThreadListView extends Backbone.View
scrollTop = $(window).scrollTop(); scrollTop = $(window).scrollTop();
windowHeight = $(window).height(); windowHeight = $(window).height();
$discussionBody = $(".discussion-body") discussionBody = $(".discussion-article")
discussionsBodyTop = $discussionBody.offset().top; discussionsBodyTop = discussionBody.offset().top;
discussionsBodyBottom = discussionsBodyTop + $discussionBody.height(); discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight();
$sidebar = $(".sidebar") sidebar = $(".sidebar")
if scrollTop > discussionsBodyTop - @sidebar_padding if scrollTop > discussionsBodyTop - @sidebar_padding
$sidebar.addClass('fixed'); sidebar.addClass('fixed');
$sidebar.css('top', @sidebar_padding); sidebar.css('top', @sidebar_padding);
else else
$sidebar.removeClass('fixed'); sidebar.removeClass('fixed');
$sidebar.css('top', '0'); sidebar.css('top', '0');
sidebarWidth = .32 * $discussionBody.width() - 10; sidebarWidth = .32 * $(".discussion-body").width() - 10;
$sidebar.css('width', sidebarWidth + 'px'); sidebar.css('width', sidebarWidth + 'px');
sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, @sidebar_padding) sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, @sidebar_padding)
topAmount = scrollTop + windowHeight topOffset = scrollTop + windowHeight
bottomAmount = discussionsBodyBottom + @sidebar_padding discussionBottomOffset = discussionsBodyBottom + @sidebar_padding
amount = Math.max(topAmount - bottomAmount, 0) amount = Math.max(topOffset - discussionBottomOffset, 0)
sidebarHeight = sidebarHeight - @sidebar_padding - amount sidebarHeight = sidebarHeight - @sidebar_padding - amount
$sidebar.css 'height', Math.max(sidebarHeight, 400) sidebar.css 'height', Math.min(Math.max(sidebarHeight, 400), discussionBody.outerHeight())
$postListWrapper = @$('.post-list-wrapper') postListWrapper = @$('.post-list-wrapper')
$postListWrapper.css('height', (sidebarHeight - @sidebar_header_height - 4) + 'px'); postListWrapper.css('height', (sidebarHeight - @sidebar_header_height - 4) + 'px');
# Because we want the behavior that when the body is clicked the menu is # Because we want the behavior that when the body is clicked the menu is
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment