diff options
| author | Tom Christie | 2013-02-20 12:18:57 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-02-20 12:18:57 +0000 |
| commit | 03afaee423967e09fe266e9fe124f661c1e10ccb (patch) | |
| tree | 22cb4f529d34cdd60ec860ef73255d0293d14d00 /rest_framework/static | |
| parent | 47a4f0863d08e4b839ea3bbd7308ecc0f995b7d9 (diff) | |
| parent | 2fb6fa2dd3b336cc442e707dbb80a4d5616582a6 (diff) | |
| download | django-rest-framework-03afaee423967e09fe266e9fe124f661c1e10ccb.tar.bz2 | |
Merge branch 'browsable_api_patch' of https://github.com/wronglink/django-rest-framework into generic-form-input
Diffstat (limited to 'rest_framework/static')
| -rw-r--r-- | rest_framework/static/rest_framework/css/default.css | 11 | ||||
| -rw-r--r-- | rest_framework/static/rest_framework/js/default.js | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index b2e41b99..73107527 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -150,6 +150,17 @@ html, body { margin: 0 auto -60px; } +.form-switcher { + margin-bottom: 0; +} + +.tab-content { + padding-top: 25px; + background: #fff; + border: 1px solid #ddd; + border-top: none; + border-radius: 0 0 4px 4px; +} #footer, #push { height: 60px; /* .push must be the same height as .footer */ diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index ecaccc0f..484a3bdf 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -3,3 +3,5 @@ prettyPrint(); $('.js-tooltip').tooltip({ delay: 1000 }); + +$('.form-switcher a:first').tab('show');
\ No newline at end of file |