encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-27 08:50:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

Browse Source
This commit is contained in:
Tom Christie 2013-05-14 21:41:39 +01:00
commit 2f54decd3e
2 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/topics/credits.md
View File

@ -122,6 +122,7 @@ The following people have helped make REST framework great.
* Daniel Hepper - [dhepper] * Daniel Hepper - [dhepper]
* Hamish Campbell - [hamishcampbell] * Hamish Campbell - [hamishcampbell]
* Marlon Bailey - [avinash240] * Marlon Bailey - [avinash240]
* James Summerfield - [jsummerfield]
Many thanks to everyone who's contributed to the project. Many thanks to everyone who's contributed to the project.
@ -280,3 +281,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[dhepper]: https://github.com/dhepper [dhepper]: https://github.com/dhepper
[hamishcampbell]: https://github.com/hamishcampbell [hamishcampbell]: https://github.com/hamishcampbell
[avinash240]: https://github.com/avinash240 [avinash240]: https://github.com/avinash240
[jsummerfield]: https://github.com/jsummerfield

10
rest_framework/templates/rest_framework/login_base.html
View File

@ -14,7 +14,6 @@
<div class="container-fluid" style="margin-top: 30px"> <div class="container-fluid" style="margin-top: 30px">
<div class="row-fluid"> <div class="row-fluid">
<div class="well" style="width: 320px; margin-left: auto; margin-right: auto"> <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
<div class="row-fluid"> <div class="row-fluid">
<div> <div>
@ -44,12 +43,9 @@
</div> </div>
</form> </form>
</div> </div>
</div><!-- /row fluid -->
</div><!--/span-->
</div><!-- /.row-fluid --> </div><!-- /.row-fluid -->
</div> </div><!--/.well-->
</div><!-- /.row-fluid -->
</div> </div><!-- /.container-fluid -->
</body> </body>
</html> </html>