diff --git a/rest_framework/static/rest_framework/docs/css/base.css b/rest_framework/static/rest_framework/docs/css/base.css index 625d42c12..f7a2f4343 100644 --- a/rest_framework/static/rest_framework/docs/css/base.css +++ b/rest_framework/static/rest_framework/docs/css/base.css @@ -1,5 +1,6 @@ body { overflow-x: hidden; + position: 'relative'; } /* Toggle Styles */ @@ -17,6 +18,8 @@ } #sidebar-wrapper { + background: #E8EAEF; + z-index: 1000; position: fixed; left: 250px; @@ -24,7 +27,6 @@ height: 100%; margin-left: -250px; overflow-y: auto; - background: #F7F7F9; -webkit-transition: all 0.5s ease; -moz-transition: all 0.5s ease; -o-transition: all 0.5s ease; @@ -65,10 +67,10 @@ text-indent: 30px; } - .sidebar-nav li a { display: block; border: 0; + border-radius: 0; font-size: 12px; font-weight: normal; color: #999999; @@ -77,14 +79,21 @@ padding: 8px 15px; } -.sidebar-nav li a:hover { - text-decoration: none; - background: rgba(255,255,255,0.9); - border: 0; +.sidebar-nav li.active > a { + background: none; } +.sidebar-nav li.active > a:hover { + background: white; +} + +.sidebar-nav > li.active > .nav > li.active > a, +.sidebar-nav li a:hover, .sidebar-nav li a:active, .sidebar-nav li a:focus { + text-decoration: none; + background: white; + border: 0; border: 0; text-decoration: none; } diff --git a/rest_framework/templates/rest_framework/docs/index.html b/rest_framework/templates/rest_framework/docs/index.html index 30fa8057c..773d7c8e8 100644 --- a/rest_framework/templates/rest_framework/docs/index.html +++ b/rest_framework/templates/rest_framework/docs/index.html @@ -26,7 +26,7 @@ - +
{% include "rest_framework/docs/sidebar.html" %} @@ -76,8 +76,6 @@ const doc = codec.decode(schema, {preloaded: true}) const client = new coreapi.Client(null, null, csrf) - $('body').scrollspy({ target: '#toc' }) - // Language Control $('.language-control li a').click(function (event) { event.preventDefault(); diff --git a/rest_framework/templates/rest_framework/docs/sidebar.html b/rest_framework/templates/rest_framework/docs/sidebar.html index 660afba28..541232e75 100644 --- a/rest_framework/templates/rest_framework/docs/sidebar.html +++ b/rest_framework/templates/rest_framework/docs/sidebar.html @@ -15,33 +15,18 @@
- - -