Merge pull request #1788 from cezar77/fix-1719

Browsable API cleanups. Fixes #1719

rest_framework/static/rest_framework/css/bootstrap-tweaks.css

@@ -6,7 +6,6 @@ a single block in the template.
 
 */
 
-
 .form-actions {
   background: transparent;
   border-top-color: transparent;
@@ -14,7 +13,7 @@ a single block in the template.
 }
 
 .navbar-inverse .brand a {
-    color: #999;
+  color: #999999;
 }
 .navbar-inverse .brand:hover a {
   color: white;
@@ -22,14 +21,15 @@ a single block in the template.
 }
 
 /* custom navigation styles */
-.wrapper .navbar{
+.navbar {
   width: 100%;
-  position: absolute;
+  position: fixed;
   left: 0;
   top: 0;
+  z-index: 3;
 }
 
-.navbar .navbar-inner{
+.navbar .navbar-inner {
   background: #2C2C2C;
   color: white;
   border: none;
@@ -37,25 +37,26 @@ a single block in the template.
   border-radius: 0px;
 }
 
-.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover{
+.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover {
   color: white;
 }
 
 .nav-list > .active > a, .nav-list > .active > a:hover {
-  background: #2c2c2c;
+  background: #2C2C2C;
 }
 
-.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{
+.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li {
   color: #A30000;
 }
-.navbar .navbar-inner .dropdown-menu li a:hover{
-  background: #eeeeee;
-  color: #c20000;
+
+.navbar .navbar-inner .dropdown-menu li a:hover {
+  background: #EEEEEE;
+  color: #C20000;
 }
 
 /*=== dabapps bootstrap styles ====*/
 
-html{
+html {
   width:100%;
   background: none;
 }
@@ -65,24 +66,28 @@ body, .navbar .navbar-inner .container-fluid {
   margin: 0 auto;
 }
 
-body{
+body {
   background: url("../img/grid.png") repeat-x;
   background-attachment: fixed;
 }
 
-#content{
+#content {
   margin: 0;
+  padding-bottom: 60px;
 }
 
 /* sticky footer and footer */
 html, body {
   height: 100%;
 }
+
 .wrapper {
+  position: relative;
+  top: 0;
+  left: 0;
+  padding-top: 60px;
+  margin: -60px 0;
   min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -60px;
 }
 
 .form-switcher {
@@ -105,7 +110,7 @@ html, body {
 }
 
 .well form .help-block {
-    color: #999;
+  color: #999999;
 }
 
 .nav-tabs {
@@ -121,39 +126,41 @@ html, body {
 }
 
 .nav-tabs > .active > a {
-    background: #f5f5f5;
+  background: #F5F5F5;
 }
 
 .nav-tabs > .active > a:hover {
-    background: #f5f5f5;
+  background: #F5F5F5;
 }
 
-.tabbable.first-tab-active .tab-content
-{
+.tabbable.first-tab-active .tab-content {
   border-top-right-radius: 0;
 }
 
-#footer, #push {
-  height: 60px; /* .push must be the same height as .footer */
-}
-
-#footer{
-    text-align: right;
+footer {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  clear: both;
+  z-index: 10;
+  height: 60px;
+  width: 95%;
+  margin: 0 2.5%;
 }
 
-#footer p {
+footer p {
   text-align: center;
   color: gray;
-  border-top: 1px solid #DDD;
+  border-top: 1px solid #DDDDDD;
   padding-top: 10px;
 }
 
-#footer a {
-  color: gray;
+footer a {
+  color: gray !important;
   font-weight: bold;
 }
 
-#footer a:hover {
+footer a:hover {
   color: gray;
 }
 
@@ -164,19 +171,19 @@ html, body {
 }
 
 /* custom general page styles */
-.hero-unit h2, .hero-unit h1{
+.hero-unit h1, .hero-unit h2 {
   color: #A30000;
 }
 
-body a, body a{
+body a {
   color: #A30000;
 }
 
-body a:hover{
+body a:hover {
   color: #c20000;
 }
 
-#content a span{
+#content a span {
   text-decoration: underline;
  }
 

rest_framework/static/rest_framework/css/default.css

@@ -33,7 +33,7 @@ h2, h3 {
 }
 
 ul.breadcrumb {
-  margin: 58px 0 0 0;
+  margin: 80px 0 0 0;
 }
 
 form select, form input, form textarea {
@@ -43,6 +43,7 @@ form select, form input, form textarea {
 form select[multiple] {
   height: 150px;
 }
+
 /* To allow tooltips to work on disabled elements */
 .disabled-tooltip-shield {
   position: absolute;
@@ -68,4 +69,3 @@ pre {
   padding-bottom: 0px;
   margin-bottom: 20px;
 }
-