Skip to content

Commit

Permalink
Use documentwrapper's height of sidebar (#9)
Browse files Browse the repository at this point in the history
This is sort of a more correct thing to do since the first/last element of the body may have a margin that can cause the documentwrapper to be taller than bodywrapper.

While this doesn't cause any major issues for this theme as is (due to the ample use of whitespace around the sidebar), this behaviour would help with derivative themes which remove the excessive margins on the sidebar.
  • Loading branch information
pradyunsg authored and Jon Wayne Parrott committed Jan 22, 2018
1 parent f87d922 commit ec38133
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions python_docs_theme/static/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ $(function() {
var jwindow = $(window);
var jdocument = $(document);
var bodywrapper = $('.bodywrapper');
var documentwrapper = $('.documentwrapper');
var sidebar = $('.sphinxsidebar');
var sidebarwrapper = $('.sphinxsidebarwrapper');

Expand Down Expand Up @@ -71,7 +72,7 @@ $(function() {
bodywrapper.css('margin-left', bw_margin_collapsed);
sidebarbutton.css({
'margin-left': '0',
'height': bodywrapper.height(),
'height': documentwrapper.height(),
'border-radius': '5px'
});
sidebarbutton.find('span').text('»');
Expand All @@ -85,7 +86,7 @@ $(function() {
sidebarwrapper.show();
sidebarbutton.css({
'margin-left': ssb_width_expanded-12,
'height': Math.max(sidebarwrapper.height(), bodywrapper.height()),
'height': Math.max(sidebarwrapper.height(), documentwrapper.height()),
'border-radius': '0 5px 5px 0'
});
sidebarbutton.find('span').text('«');
Expand All @@ -109,7 +110,7 @@ $(function() {
// find the height of the viewport to center the '<<' in the page
var viewport_height = get_viewport_height();
var sidebar_offset = sidebar.offset().top;
var sidebar_height = Math.max(bodywrapper.height(), sidebar.height());
var sidebar_height = Math.max(documentwrapper.height(), sidebar.height());
sidebarbutton.find('span').css({
'display': 'block',
'position': 'fixed',
Expand Down

0 comments on commit ec38133

Please sign in to comment.