diff options
| author | Tom Christie | 2012-10-05 19:26:45 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-05 19:26:45 +0100 |
| commit | 0b08d25297b63525a9193780b590d9f0e51906da (patch) | |
| tree | 9c5044c80f36e3c3aaa5a2c5c0c866066a52ad28 /docs | |
| parent | 268131ce3793ffe8908b9997ab240b968990a7ac (diff) | |
| parent | 4e7fffa993a40b705e77580a5fd589170e2e602b (diff) | |
| download | django-rest-framework-0b08d25297b63525a9193780b590d9f0e51906da.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/static/css/default.css | 75 | ||||
| -rw-r--r-- | docs/template.html | 44 |
2 files changed, 63 insertions, 56 deletions
diff --git a/docs/static/css/default.css b/docs/static/css/default.css index 8401687d..742a4147 100644 --- a/docs/static/css/default.css +++ b/docs/static/css/default.css @@ -1,15 +1,5 @@ /* Set the body padding-top when above 980px to push the content down from below the navbar, which is fixed at >980px screen widths. */ -@media (min-width: 980px) { - body { - padding-top: 71px; - } -} - -body { - padding-bottom: 40px; -} - pre { font-size: 12px; } @@ -61,28 +51,9 @@ a.github:hover { text-decoration: none; } -/* Footer */ -/* -.footer p { - text-align: center; - color: gray; - border-top: 1px solid #DDD; - padding-top: 10px; -} - -.footer a { - color: gray; - font-weight: bold; -} - -.footer a:hover { - color: gray; -} -*/ - /* */ body hr { - border-top: 1px dotted #A30000 + border-top: 1px dotted #A30000; } /* Force TOC text to not overrun */ @@ -100,7 +71,7 @@ pre { /* Preserve the spacing of the navbar across different screen sizes. */ .navbar-inner { - padding: 5px 0; + /*padding: 5px 0;*/ } @media (max-width: 979px) { @@ -194,8 +165,9 @@ body{ color: white; } -.nav-list > .active > a, .nav-list > .active > a:hover { - background: #2c2c2c; +.nav-list > .active > a, .navbar .navbar-inner .nav li a:hover { + background:#212121; + color:white; } .navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{ @@ -233,3 +205,40 @@ body a:hover{ } } + +/* sticky footer and footer */ +html, body { + height: 100%; +} +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -60px; +} + +.body-content{ + padding-top: 70px; + padding-bottom: 70px; +} + +footer, .push { + height: 60px; /* .push must be the same height as .footer */ +} + + +footer p { + text-align: center; + color: gray; + border-top: 1px solid #DDD; + padding-top: 10px; +} + +footer a { + color: gray; + font-weight: bold; +} + +footer a:hover { + color: gray; +} diff --git a/docs/template.html b/docs/template.html index 8630de77..39d7f4ae 100644 --- a/docs/template.html +++ b/docs/template.html @@ -19,6 +19,8 @@ <![endif]--> <body onload="prettyPrint()" class="{{ page_id }}-page"> + <div class="wrapper"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container-fluid"> @@ -91,35 +93,31 @@ </div> </div> - <div id="wrap"> - - <div class="container-fluid"> - <div class="row-fluid"> + <div class="body-content"> + <div class="container-fluid"> + <div class="row-fluid"> - <div class="span3"> - <div id="table-of-contents"> - <ul class="nav nav-list side-nav well sidebar-nav-fixed"> - {{ toc }} - </ul> + <div class="span3"> + <div id="table-of-contents"> + <ul class="nav nav-list side-nav well sidebar-nav-fixed"> + {{ toc }} + </ul> + </div> </div> - </div> - <div id="main-content" class="span9"> - {{ content }} - </div><!--/span--> - </div><!--/row--> - </div><!--/.fluid-container--> + <div id="main-content" class="span9"> + {{ content }} + </div><!--/span--> + </div><!--/row--> + </div><!--/.fluid-container--> + </div><!--/.body content--> <div id="push"></div> - </div> + </div><!--/.wrapper --> - <!-- - <div class="row footer"> - <div class="span12"> - <p>Sponsored by <a href="http://dabapps.com/">Dab Apps</a>.</a></p> - </div> - </div> - --> + <footer class="span12"> + <p>Sponsored by <a href="http://dabapps.com/">Dab Apps</a>.</a></p> + </footer> <!-- Le javascript ================================================== --> |