diff options
| author | Pablo Recio | 2013-05-18 16:11:06 +0200 |
|---|---|---|
| committer | Pablo Recio | 2013-05-18 16:11:06 +0200 |
| commit | 50ba26822d5c448295dfd514452ea2278af09708 (patch) | |
| tree | d602e6144db04eb8b20313fe45d785994c747acd /docs/topics | |
| parent | 392c8556aed41df2120623fe1c891610bb111100 (diff) | |
| parent | ea9a3d88bce5507af753a79b259e6bd8e53a9059 (diff) | |
| download | django-rest-framework-50ba26822d5c448295dfd514452ea2278af09708.tar.bz2 | |
Merge branch 'master' into 675-empty-label-related-field
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/browsable-api.md | 11 | ||||
| -rw-r--r-- | docs/topics/credits.md | 4 |
2 files changed, 15 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 5998b4ca..bba78ba8 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -127,6 +127,8 @@ The following people have helped make REST framework great. * Craig de Stigter - [craigds] * Pablo Recio - [pyriku] * Brian Zambrano - [brianz] +* Òscar Vilaplana - [grimborg] +* Ryan Kaskel - [ryankask] Many thanks to everyone who's contributed to the project. @@ -290,3 +292,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [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 |