diff options
| author | Tom Christie | 2012-10-05 09:04:17 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-10-05 09:04:17 -0700 |
| commit | 4e7fffa993a40b705e77580a5fd589170e2e602b (patch) | |
| tree | ed65a47f253b06787531b3579d16a408c9ac466e /rest_framework | |
| parent | cc21948a69f5cea90ca02042549af29c20e0268a (diff) | |
| parent | 101f06b50b7e767aa1580d7d2bd48c8b1233cc83 (diff) | |
| download | django-rest-framework-4e7fffa993a40b705e77580a5fd589170e2e602b.tar.bz2 | |
Merge pull request #284 from maximilianhurl/doc-styles
Added sticky footer and styles to HTML API page
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/static/rest_framework/css/default.css | 125 | ||||
| -rw-r--r-- | rest_framework/static/rest_framework/img/grid.png | bin | 0 -> 1458 bytes | |||
| -rw-r--r-- | rest_framework/templates/rest_framework/base.html | 15 |
3 files changed, 118 insertions, 22 deletions
diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index b569b1f5..4d61ac8f 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -1,15 +1,6 @@ -body { - padding-top: 0; - padding-bottom: 1em; -} /* The navbar is fixed at >= 980px wide, so add padding to the body to prevent content running up underneath it. */ -@media (min-width:980px) { - body { - padding-top: 60px; - } -} h1 { font-weight: 500; @@ -22,14 +13,6 @@ h2, h3 { .resource-description, .response-info { margin-bottom: 2em; } - -#footer { - border-top: 1px solid #eee; - margin-top: 2em; - padding-top: 1em; - text-align: right; -} - .version:before { content: "v"; opacity: 0.6; @@ -68,4 +51,110 @@ pre { .page-header { border-bottom: none; padding-bottom: 0px; -}
\ No newline at end of file +} + + +/*=== dabapps bootstrap styles ====*/ + +html{ + width:100%; + background: none; +} + +body, .navbar .navbar-inner .container-fluid{ + max-width: 1150px; + margin: 0 auto; +} + +body{ + background: url("../img/grid.png") repeat-x; + background-attachment: fixed; +} + +#content{ + margin: 40px 0 0 0; +} +/* custom navigation styles */ +.wrapper .navbar{ + width:100%; + position: absolute; + left:0; +} + +.navbar .navbar-inner{ + background: #2C2C2C; + color: white; + border: none; + border-top: 5px solid #A30000; + border-radius: 0px; +} + +.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand{ + color: white; +} + +.nav-list > .active > a, .nav-list > .active > a:hover { + background: #2c2c2c; +} + +.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{ + color: #A30000; +} +.navbar .navbar-inner .dropdown-menu li a:hover{ + background: #eeeeee; + color: #c20000; +} + +/* custom general page styles */ +.hero-unit h2, .hero-unit h1{ + color: #A30000; +} + +body a, body a{ + color: #A30000; +} + +body a:hover{ + color: #c20000; +} + +#content a span{ + text-decoration: underline; + } + +/* sticky footer and footer */ +html, body { + height: 100%; +} +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -60px; +} + + +#footer, #push { + height: 60px; /* .push must be the same height as .footer */ +} + +#footer{ + text-align: right; +} + +#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/rest_framework/static/rest_framework/img/grid.png b/rest_framework/static/rest_framework/img/grid.png Binary files differnew file mode 100644 index 00000000..878c3ed5 --- /dev/null +++ b/rest_framework/static/rest_framework/img/grid.png diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a5e08942..f213554b 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -25,10 +25,12 @@ <body class="{% block bodyclass %}{% endblock %} container"> + <div class="wrapper"> + {% block navbar %} - <div class="navbar navbar-fixed-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> + <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> <div class="navbar-inner"> - <div class="container"> + <div class="container-fluid"> <span class="brand" href="/"> {% block branding %}<a href='http://django-rest-framework.org'>Django REST framework <span class="version">{{ version }}</span></a>{% endblock %} </span> @@ -118,6 +120,7 @@ {% endfor %} </div>{{ content|urlize_quoted_links }}</pre>{% endautoescape %} </div> + </div> {% if response.status_code != 403 %} @@ -181,14 +184,18 @@ </div> <!-- END Content --> + <div id="push"></div> + + </div> + + </div><!-- ./wrapper --> + {% block footer %} <div id="footer"> <a class="powered-by" href='http://django-rest-framework.org'>Django REST framework</a> <span class="version">{{ version }}</span> </div> {% endblock %} - </div> - {% block script %} <script src="{% get_static_prefix %}rest_framework/js/jquery-1.8.1-min.js"></script> <script src="{% get_static_prefix %}rest_framework/js/bootstrap.min.js"></script> |
