diff options
| author | Karol Majta | 2013-05-18 16:56:38 +0200 |
|---|---|---|
| committer | Karol Majta | 2013-05-18 16:56:38 +0200 |
| commit | 5bebd29f11dd9268b9a23c27cf58c8440664f5e9 (patch) | |
| tree | 66f75d176f8746432cf9083c0bdfe92a068e142f /docs/topics | |
| parent | ebe959b52a10a88975b15c69275b0ef5c50cb9fa (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-5bebd29f11dd9268b9a23c27cf58c8440664f5e9.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/browsable-api.md | 11 | ||||
| -rw-r--r-- | docs/topics/credits.md | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md index 8ee01824..65f76abc 100644 --- a/docs/topics/browsable-api.md +++ b/docs/topics/browsable-api.md @@ -35,6 +35,17 @@ A suitable replacement theme can be generated using Bootstrap's [Customize Tool] You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block. The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style. +Full Example + + {% extends "rest_framework/base.html" %} + + {% block bootstrap_theme %} + <link rel="stylesheet" href="/path/to/yourtheme/bootstrap.min.css' type="text/css"> + {% endblock %} + + {% block bootstrap_navbar_variant %}{% endblock %} + + For more specific CSS tweaks, use the `style` block instead. diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 8151b4d3..d805c0c1 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -124,6 +124,12 @@ The following people have helped make REST framework great. * Marlon Bailey - [avinash240] * James Summerfield - [jsummerfield] * Andy Freeland - [rouge8] +* Craig de Stigter - [craigds] +* Pablo Recio - [pyriku] +* Brian Zambrano - [brianz] +* Òscar Vilaplana - [grimborg] +* Ryan Kaskel - [ryankask] +* Andy McKay - [andymckay] Many thanks to everyone who's contributed to the project. @@ -284,3 +290,9 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [avinash240]: https://github.com/avinash240 [jsummerfield]: https://github.com/jsummerfield [rouge8]: https://github.com/rouge8 +[craigds]: https://github.com/craigds +[pyriku]: https://github.com/pyriku +[brianz]: https://github.com/brianz +[grimborg]: https://github.com/grimborg +[ryankask]: https://github.com/ryankask +[andymckay]: https://github.com/andymckay |