aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-02-22 04:05:06 -0800
committerTom Christie2013-02-22 04:05:06 -0800
commit5d37612e7877fd4ef6a963930a1208cc6c548306 (patch)
tree013b6bc3af269656df9c9cc61ff7b84b30636743
parentef3303eb3702f365aeecb8296592cffa93c4afc7 (diff)
parent7b9e134a8ff473891d791492e1fba27abe6f6721 (diff)
downloaddjango-rest-framework-5d37612e7877fd4ef6a963930a1208cc6c548306.tar.bz2
Merge pull request #671 from wronglink/appearance_fix
Minimal appearance fixes in addition to #663
-rw-r--r--rest_framework/static/rest_framework/css/default.css17
-rw-r--r--rest_framework/static/rest_framework/js/default.js8
2 files changed, 16 insertions, 9 deletions
diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css
index 4e7cbc06..d806267b 100644
--- a/rest_framework/static/rest_framework/css/default.css
+++ b/rest_framework/static/rest_framework/css/default.css
@@ -154,6 +154,12 @@ html, body {
margin-bottom: 0;
}
+.well {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+
.well .form-actions {
padding-bottom: 0;
margin-bottom: 0;
@@ -168,7 +174,6 @@ html, body {
}
.nav-tabs > li {
- margin-bottom: -3px;
float: right;
}
@@ -184,13 +189,9 @@ html, body {
background: #f5f5f5;
}
-.tabs-below > .nav-tabs {
- border-bottom: none !important;
-}
-
-.tabs-below > .nav-tabs > li {
- margin-bottom: -2px !important;
- margin-right: 0 !important;
+.tabbable.first-tab-active .tab-content
+{
+ border-top-right-radius: 0;
}
#footer, #push {
diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js
index 484a3bdf..c74829d7 100644
--- a/rest_framework/static/rest_framework/js/default.js
+++ b/rest_framework/static/rest_framework/js/default.js
@@ -4,4 +4,10 @@ $('.js-tooltip').tooltip({
delay: 1000
});
-$('.form-switcher a:first').tab('show'); \ No newline at end of file
+$('a[data-toggle="tab"]:first').on('shown', function (e) {
+ $(e.target).parents('.tabbable').addClass('first-tab-active');
+});
+$('a[data-toggle="tab"]:not(:first)').on('shown', function (e) {
+ $(e.target).parents('.tabbable').removeClass('first-tab-active');
+});
+$('.form-switcher a:first').tab('show');