From 77460d4bca87ee6f8f83619a7f8e66baad73666e Mon Sep 17 00:00:00 2001 From: Adam Parsons Date: Wed, 8 Apr 2015 20:10:33 -0500 Subject: [PATCH 1/3] Moved ul.breadcrumb margin to bootstrap-tweaks.css When importing other bootstrap themes from sites like bootswatch, the margin in default.css persists and adds a 70px margin below the header. This change will remove that margin when users choose to use a different bootstrap theme. --- rest_framework/static/rest_framework/css/bootstrap-tweaks.css | 4 ++++ rest_framework/static/rest_framework/css/default.css | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 04f12ed3d..40343275b 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -60,6 +60,10 @@ a single block in the template. color: #C20000; } +ul.breadcrumb { + margin: 70px 0 0 0; +} + .pagination>.disabled>a, .pagination>.disabled>a:hover, .pagination>.disabled>a:focus { diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 4f52cc566..288738c2c 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -32,10 +32,6 @@ h2, h3 { margin-right: 1em; } -ul.breadcrumb { - margin: 70px 0 0 0; -} - .breadcrumb li.active a { color: #777; } From 324ccc3664cae242d43c05d9ed24f0aeff3c34a2 Mon Sep 17 00:00:00 2001 From: Adam Parsons Date: Sat, 18 Apr 2015 16:50:32 -0500 Subject: [PATCH 2/3] Moved breadcrumb color to bootstrap-tweaks Moved to color associated with the breadcrumb to the tweaks style sheet. --- rest_framework/static/rest_framework/css/bootstrap-tweaks.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 40343275b..f455c904d 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -64,6 +64,10 @@ ul.breadcrumb { margin: 70px 0 0 0; } +.breadcrumb li.active a { + color: #777; +} + .pagination>.disabled>a, .pagination>.disabled>a:hover, .pagination>.disabled>a:focus { From 72230a913ebacf8db3e7b912ba23ba14ff4f7abb Mon Sep 17 00:00:00 2001 From: Adam Parsons Date: Sat, 18 Apr 2015 16:52:20 -0500 Subject: [PATCH 3/3] Removed color from default --- rest_framework/static/rest_framework/css/default.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 288738c2c..ede54bd17 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -13,6 +13,7 @@ h2, h3 { .resource-description, .response-info { margin-bottom: 2em; } + .version:before { content: "v"; opacity: 0.6; @@ -32,10 +33,6 @@ h2, h3 { margin-right: 1em; } -.breadcrumb li.active a { - color: #777; -} - form select, form input, form textarea { width: 90%; }