Commit 9e4b24da by Greg Price

Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap

Fix forums nav sidebar overlapping content
parents 5ec6cd85 8a32f274
...@@ -64,10 +64,8 @@ if Backbone? ...@@ -64,10 +64,8 @@ if Backbone?
sidebar = $(".sidebar") sidebar = $(".sidebar")
if scrollTop > discussionsBodyTop - @sidebar_padding if scrollTop > discussionsBodyTop - @sidebar_padding
sidebar.addClass('fixed'); sidebar.css('top', scrollTop - discussionsBodyTop + @sidebar_padding);
sidebar.css('top', @sidebar_padding);
else else
sidebar.removeClass('fixed');
sidebar.css('top', '0'); sidebar.css('top', '0');
sidebarWidth = .31 * $(".discussion-body").width(); sidebarWidth = .31 * $(".discussion-body").width();
......
...@@ -690,14 +690,6 @@ body.discussion { ...@@ -690,14 +690,6 @@ body.discussion {
border-radius: 3px; border-radius: 3px;
background: #f6f6f6; background: #f6f6f6;
box-shadow: 0 1px 2px rgba(0, 0, 0, .05); box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
&.fixed {
@include box-sizing(border-box);
position: fixed;
top: 0px;
width: 32%;
}
} }
.browse-search { .browse-search {
...@@ -1264,10 +1256,6 @@ body.discussion { ...@@ -1264,10 +1256,6 @@ body.discussion {
border-radius: 3px; border-radius: 3px;
background: $white; background: $white;
box-shadow: 0 1px 2px rgba(0, 0, 0, .05); box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
&.sidebar-fixed {
margin-left: 32%;
}
} }
.blank-slate { .blank-slate {
......
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