1 files changed, 42 insertions, 97 deletions

diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
index 12bb24e5..5d0aa9aa 100755
--- a/cyborg/bootswatch.less
+++ b/cyborg/bootswatch.less
@@ -1,35 +1,33 @@
 // Bootswatch.less
 // Swatch: Cyborg
+// Version: 2.0.2
 // -----------------------------------------------------
 
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-// Ubuntu web font
 @import url('http://fonts.googleapis.com/css?family=Droid+Sans:400,700');
 
-h1, h2, h3, h4, h5, .navbar .brand, .navbar .nav-collapse.collapse .nav li > a {
-	color: @grayLighter;
-	font-weight: normal;
-	text-shadow: none;
-}
-
 .navbar {
 	font-size: 16px;
 }
 
-label, input, button, select, textarea {
-	font-family: 'Droid Sans', sans-serif;
-	color: @gray;
+.navbar .brand,
+.navbar .nav-collapse.in .nav li > a {
+	color: @grayLighter;
+	font-weight: normal;
+	text-shadow: none;
 }
 
-.navbar .search-query:-moz-placeholder {
+label, input, button, select, textarea,
+.navbar .search-query:-moz-placeholder,
+.navbar .search-query::-webkit-input-placeholder {
 	font-family: 'Droid Sans', sans-serif;
 	color: @gray;
 }
-	
-.navbar .search-query::-webkit-input-placeholder {
-	font-family: 'Droid Sans', sans-serif;
+
+.jumbotron h1 {
+	font-weight: normal !important;
 }
 
 blockquote {
@@ -44,8 +42,7 @@ blockquote {
 // -----------------------------------------------------
 
 body {
-	background-color: #060606;
-	#gradient > .vertical (#060606, #252A30);
+	#gradient > .vertical (@bodyBackground, #252A30);
 }
 
 .page-header {
@@ -62,13 +59,19 @@ body {
   border-bottom: 2px solid @blue
 }
 
+.navbar .brand {
+	padding: 12px 20px 8px;
+}
+
 .navbar .nav li > a {
 	padding: 13px 10px 8px;
 	border-bottom: 3px solid rgba(0, 0, 0, 0);
 }
 
-.navbar .brand {
-	padding: 12px 20px 8px;
+.navbar .nav .active > a,
+.navbar .nav li > a:hover,
+.navbar .brand:hover {
+	border-bottom: 3px solid @blue
 }
 
 .navbar .search-query,
@@ -81,13 +84,6 @@ body {
 	.placeholder(@gray);
 }
 
-.navbar .nav .active > a,
-.navbar .nav li > a:hover,
-.navbar .brand:hover {
-	border-bottom: 3px solid @blue
-}
-
-// Added dividers to items
 .navbar .nav > li > a {
 	border-left: 1px solid #222;	
 }
@@ -113,11 +109,11 @@ body {
 	display: none;
 }
 
-.navbar .nav-collapse.collapse .nav > li > a {
+.navbar .nav-collapse.in .nav > li > a {
 	border-left: 0;
 }
 
-.navbar .nav-collapse.collapse .nav a:hover {
+.navbar .nav-collapse.in .nav a:hover {
 	background-color: @blue;
 }
 
@@ -183,75 +179,11 @@ div.subnav .nav .dropdown.open {
 			border-bottom: 0;
 			background-color: @blue;
 	}
-	
-}
-
-// TABLES
-// -----------------------------------------------------
-
-.table-bordered {
-  border: 1px solid #222;
-  
-  th + th,
-  td + td,
-  th + td,
-  td + th {
-    border-left: 1px solid #222;
-  }
-  // Prevent a double border
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-}
-
-.table th, .table td {
-  	border-top: 1px solid #222;
-}
-
-// make shaded elements light gray
-.breadcrumb,
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
-	background-color: rgba(40, 40, 40, 0.5);
-}
-
-.table-striped tbody tr:nth-child(even) td,
-.table-striped tbody tr:nth-child(even) th {
-	background-color: transparent;
-}
-
-.table tbody tr:hover th,
-.table tbody tr:hover td {
-	background-color: @grayDark;
 }
 
-code, pre, pre.prettyprint {
-	background-color: @grayLighter;
-}
-
-.well {
-	background-color: rgba(40, 40, 40, 0.5);
-	background-color: #131517;
-	border-top: solid 1px rgba(256,256,256,.1);
-	.box-shadow(0 2px 4px rgba(0,0,0,.8));
-}
-
-
-.table, .well, .prettyprint, input, textarea, select {
-	.border-radius(1px);
-}
-
-input, textarea, select, .uneditable-input {
-	color: @grayDark;
-}
-
-
 // NAVIGATION
 // -----------------------------------------------------
 
-
 .nav-list > li > a, .nav-list .nav-header {
 	text-shadow: none;
 }
@@ -333,8 +265,7 @@ input, textarea, select, .uneditable-input {
 // BUTTONS
 // -----------------------------------------------------
 
-.btn, {
-	border: 0;
+.btn {
 	.border-radius(3px);
 	.box-shadow(1px 1px 2px #111);
 	.buttonBackground(darken(@gray, 20%), darken(@gray, 30%));
@@ -342,7 +273,6 @@ input, textarea, select, .uneditable-input {
 	text-shadow: none;
 	
 	&:hover {
-	    background-color: darken(@gray, 35%);
 		text-shadow: none;
 	  	color: @white;
 	}
@@ -410,10 +340,7 @@ input, textarea, select, .uneditable-input {
 // -----------------------------------------------------
 
 input, textarea, select {
-	background-color: #ccc;
-	border-color: #bbb;
 	border-width: 2px;
-	.placeholder(@gray);
 } 
 
 legend, label {
@@ -421,6 +348,10 @@ legend, label {
 	border-bottom: 0px solid #222;
 }
 
+input, textarea, select, .uneditable-input {
+	color: @grayDark;
+}
+
 input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly], .uneditable-input {
 	background-color: #555;
 	border-color: #444;
@@ -455,6 +386,20 @@ select:focus {
 // MISCELLANEOUS
 // -----------------------------------------------------
 
+.table, .well, .prettyprint, input, textarea, select {
+	.border-radius(1px);
+}
+
+code, pre, pre.prettyprint {
+	background-color: @grayLighter;
+}
+
+.well {
+	background-color: rgba(40, 40, 40, 0.5);
+	background-color: #131517;
+	border-top: solid 1px rgba(256,256,256,.1);
+	.box-shadow(0 2px 4px rgba(0,0,0,.8));
+}
 
 .progress {
 	background-color: #060606;