diff options
| author | Tom Christie | 2013-02-22 00:42:37 -0800 |
|---|---|---|
| committer | Tom Christie | 2013-02-22 00:42:37 -0800 |
| commit | ef3303eb3702f365aeecb8296592cffa93c4afc7 (patch) | |
| tree | bc6297fb5bb590558dd312d976eb5225eb2f9119 /rest_framework/static | |
| parent | 47a4f0863d08e4b839ea3bbd7308ecc0f995b7d9 (diff) | |
| parent | 31f3fa63b2758d1e16f6814f4ac18647412bdddb (diff) | |
| download | django-rest-framework-ef3303eb3702f365aeecb8296592cffa93c4afc7.tar.bz2 | |
Merge pull request #670 from tomchristie/generic-form-input
PUT or PATCH raw data (eg. json) from Browseable API
Diffstat (limited to 'rest_framework/static')
| -rw-r--r-- | rest_framework/static/rest_framework/css/default.css | 42 | ||||
| -rw-r--r-- | rest_framework/static/rest_framework/js/default.js | 2 |
2 files changed, 44 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..4e7cbc06 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -150,6 +150,48 @@ html, body { margin: 0 auto -60px; } +.form-switcher { + margin-bottom: 0; +} + +.well .form-actions { + padding-bottom: 0; + margin-bottom: 0; +} + +.well form { + margin-bottom: 0; +} + +.nav-tabs { + border: 0; +} + +.nav-tabs > li { + margin-bottom: -3px; + float: right; +} + +.nav-tabs li a { + margin-right: 0; +} + +.nav-tabs > .active > a { + background: #f5f5f5; +} + +.nav-tabs > .active > a:hover { + background: #f5f5f5; +} + +.tabs-below > .nav-tabs { + border-bottom: none !important; +} + +.tabs-below > .nav-tabs > li { + margin-bottom: -2px !important; + margin-right: 0 !important; +} #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 |
