diff options
| -rw-r--r-- | doc/build/static/docs.css | 6 | ||||
| -rw-r--r-- | doc/build/static/init.js | 12 | ||||
| -rw-r--r-- | doc/build/templates/layout.mako | 18 |
3 files changed, 18 insertions, 18 deletions
diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index a740fc426..f6e7cc6f2 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -1,5 +1,9 @@ /* global */ +.body-background { + background-color: #FDFBFC; +} + body { background-color: #FDFBFC; margin:0 38px; @@ -197,7 +201,6 @@ a.headerlink:hover { #docs-top-navigation-container { - background-color:#FFF; } #docs-top-navigation-container.automated { @@ -205,7 +208,6 @@ a.headerlink:hover { top:0; z-index:100; width:100%; - background-color:#FFF; } /* http://css-tricks.com/hash-tag-links-padding/ */ diff --git a/doc/build/static/init.js b/doc/build/static/init.js index 0d3e678ba..0732890c9 100644 --- a/doc/build/static/init.js +++ b/doc/build/static/init.js @@ -12,11 +12,8 @@ var automatedBreakpoint = -1; function initFloatyThings() { automatedBreakpoint = $("#docs-container").position().top; - containerHeight = $("#docs-top-navigation-container").height(); - - // TODO: calculate the '9' here - autoOffset = containerHeight + 9; + parentOffset = $("#docs-container").parent().position().top - $("#docs-container").position().top; $("#docs-top-navigation-container").addClass("preautomated"); $("#docs-sidebar").addClass("preautomated"); $("#docs-container").addClass("preautomated"); @@ -32,7 +29,12 @@ function initFloatyThings() { setNavSize(); $("#docs-top-navigation-container").addClass("automated"); $("#docs-sidebar").addClass("automated"); - $("#docs-body").css("margin-top", autoOffset); + + // note this height is dependent on docs-top-navigation-container + // being position:fixed or absolute, otherwise it might get + // a little squashed + containerHeight = $("#docs-top-navigation-container").height(); + $("#docs-body").css("margin-top", containerHeight - parentOffset + 1); } else { $("#docs-sidebar.automated").scrollTop(0); diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako index 09e858482..b4659ce98 100644 --- a/doc/build/templates/layout.mako +++ b/doc/build/templates/layout.mako @@ -16,12 +16,12 @@ main site. docs-container -> - docs-header -> - docs-search - docs-version-header - docs-top-navigation - docs-top-page-control - docs-navigation-banner + docs-top-navigation-container -> + docs-header -> + docs-version-header + docs-top-navigation + docs-top-page-control + docs-navigation-banner docs-body-container -> docs-sidebar docs-body @@ -91,18 +91,14 @@ withsidebar = bool(toc) and current_page_name != 'index' </%block> -<div id="docs-top-navigation-container"> +<div id="docs-top-navigation-container" class="body-background"> <div id="docs-header"> <div id="docs-version-header"> Release: <span class="version-num">${release}</span> | Release Date: ${release_date} - - </div> <h1>${docstitle|h}</h1> - - </div> <div id="docs-top-navigation"> <div id="docs-top-page-control" class="docs-navigation-links"> |