1 files changed, 157 insertions, 140 deletions

diff --git a/slate/bootswatch.less b/slate/bootswatch.less
index 928f6513..6dd84fa6 100755
--- a/slate/bootswatch.less
+++ b/slate/bootswatch.less
@@ -3,13 +3,28 @@
 // Version: 2.1.0
 // -----------------------------------------------------
 
-// SCAFFOLDING
+// TYPOGRAPHY
 // -----------------------------------------------------
 
-h1, h2, h3, h4, h5, h6, legend, label {
+h1, h2, h3, h4, h5, h6 {
 	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
 
+code, pre {
+	background-color: #F7F7F7;
+	border: 1px solid darken(@grayDarker, 5%);
+	text-shadow: none;
+}
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
+hr, legend, .page-header {
+	border-top: none;
+	border-bottom: 1px solid darken(@grayDarker, 5%);
+	background-color: transparent;
+}
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -111,12 +126,6 @@ h1, h2, h3, h4, h5, h6, legend, label {
 	}
 }
 
-@media (max-width: 979px) {
-	.navbar .brand {
-		border-right: none;
-	}
-}
-
 div.subnav {
 	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
 	border: 1px solid transparent;
@@ -170,62 +179,74 @@ div.subnav {
 	}
 }
 
-@media (max-width: 768px) {
-	div.subnav .nav > li + li > a {
-		border-top: 1px solid transparent;
-	}
-}
-
-// BUTTONS
+// NAV
 // -----------------------------------------------------
 
-.btn {
-    .buttonBackground(@gray, darken(@gray, 10%));
-	.border-radius(3px);
-	border: 1px solid @grayDarker;
+.nav .nav-header {
+	text-shadow: none;
 }
 
-.btn, .btn:hover {
-	color: @white;
+.nav > li > a {
+	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+	border: none;
+	color: @grayLight;
 	font-weight: bold;
 	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
+.nav > li.active > a,
+.nav > li.active > a:hover {
+	background-color: transparent;
+	border: none;
+	color: @white;
 }
 
-.btn-warning {
-  .buttonBackground(lighten(@orange, 15%), @orange);
+.nav > li > a:hover {
+	background-color: transparent;
+	color: @grayLighter;
 }
 
-.btn-danger {
-  .buttonBackground(#ee5f5b, #bd362f);
-}
+.nav-list {
+	background-color: @grayDark;
+	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
 
-.btn-success {
-  .buttonBackground(#62c462, #51a351);
-}
+	li > a {
+		background-image: none;
+		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+	}
 
-.btn-info {
-  .buttonBackground(#5bc0de, #2f96b4);
-}
+	.nav-header {
+		color: @gray;
+		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+	}
 
-.btn-inverse {
-  .buttonBackground(#454545, #262626);
+	.divider {
+		border-bottom: 1px solid darken(@grayDarker, 5%);
+		background-color: transparent;
+	}
 }
 
-.caret {
-	border-top-color: @white;
+.nav-tabs {
+	border-bottom: none;
 }
 
-// TABLES
-// -----------------------------------------------------
+.tabs-below .nav-tabs {
+	border-top: none;
+}
 
+.tabs-left .nav-tabs {
+	border-right: none;
+}
 
+.tabs-right .nav-tabs {
+	border-left: none;
+}
 
-// NAVIGATION
-// -----------------------------------------------------
+.nav-tabs.nav-stacked > li > a,
+.nav-tabs.nav-stacked > li > a:hover {
+	border: none;
+}
 
 .breadcrumb {
 	.box-shadow(none);
@@ -293,85 +314,51 @@ div.subnav {
 	}
 }
 
-.nav .nav-header {
-	text-shadow: none;
-}
+// BUTTONS
+// -----------------------------------------------------
 
-.nav > li > a {
-	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
-	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
-	border: none;
-	color: @grayLight;
-	font-weight: bold;
-	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+.btn {
+    .buttonBackground(@gray, darken(@gray, 10%));
+	.border-radius(3px);
+	border: 1px solid @grayDarker;
 }
 
-.nav > li.active > a,
-.nav > li.active > a:hover {
-	background-color: transparent;
-	border: none;
+.btn, .btn:hover {
 	color: @white;
+	font-weight: bold;
+	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 
-.nav > li > a:hover {
-	background-color: transparent;
-	color: @grayLighter;
-}
-
-.nav-list {
-	background-color: @grayDark;
-	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
-
-	li > a {
-		background-image: none;
-		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-	}
-
-	.nav-header {
-		color: @gray;
-		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-	}
-
-	.divider {
-		border-bottom: 1px solid darken(@grayDarker, 5%);
-		background-color: transparent;
-	}
+.btn-primary {
+  .buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
 }
 
-.nav-tabs {
-	border-bottom: none;
+.btn-warning {
+  .buttonBackground(lighten(@orange, 15%), @orange);
 }
 
-.tabs-below .nav-tabs {
-	border-top: none;
+.btn-danger {
+  .buttonBackground(#ee5f5b, #bd362f);
 }
 
-.tabs-left .nav-tabs {
-	border-right: none;
+.btn-success {
+  .buttonBackground(#62c462, #51a351);
 }
 
-.tabs-right .nav-tabs {
-	border-left: none;
+.btn-info {
+  .buttonBackground(#5bc0de, #2f96b4);
 }
 
-.nav-tabs.nav-stacked > li > a,
-.nav-tabs.nav-stacked > li > a:hover {
-	border: none;
+.btn-inverse {
+  .buttonBackground(#454545, #262626);
 }
 
-.dropdown-menu {
-	.box-shadow(0 5px 5px rgba(0, 0, 0, 0.2));
-
-	li.active a,
-	li.active a:hover {
-		background-color: @grayDark;
-	}
+.caret {
+	border-top-color: @white;
 }
 
-.dropdown.open .dropdown-toggle {
-	background-color: @grayDark;
-	color: @grayLighter;
-}
+// TABLES
+// -----------------------------------------------------
 
 // FORMS
 // -----------------------------------------------------
@@ -380,8 +367,8 @@ label, input, button, select, textarea, legend {
 	color: @textColor;
 }
 
-.form-actions {
-	border-top: none;
+legend, label {
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
 
 .input-prepend .add-on,
@@ -411,7 +398,34 @@ textarea[readonly] {
 	color: @grayLighter;
 }
 
-// LABELS AND ALERTS
+.form-actions {
+	border-top: none;
+}
+
+// DROPDOWNS
+// -----------------------------------------------------
+
+.dropdown-menu {
+	.box-shadow(0 5px 5px rgba(0, 0, 0, 0.2));
+
+	li.active a,
+	li.active a:hover {
+		background-color: @grayDark;
+	}
+}
+
+.dropdown.open .dropdown-toggle {
+	background-color: @grayDark;
+	color: @grayLighter;
+}
+
+.dropdown-menu .divider {
+	border-top: none;
+	border-bottom: 1px solid darken(@grayDarker, 5%);
+	background-color: transparent;
+}
+
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
 .label, .alert {
@@ -445,59 +459,62 @@ textarea[readonly] {
   border-color: @infoText;
 }
 
-// MODALS
+// MISC
 // -----------------------------------------------------
 
-.modal {
-	background-color: darken(@grayDark, 5%);
+.well, .hero-unit {
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-.modal-header {
-	border-bottom: none;
+.thumbnail,
+a.thumbnail:hover {
+  border: 1px solid darken(@grayDarker, 5%);
 }
 
-.modal-body {
-	border-bottom: 1px solid #1C1E22;
+.progress {
+	background-color: darken(@grayDarker, 3%);
+	#gradient > .vertical(darken(@grayDarker, 3%), darken(@grayDarker, 3%));
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-.modal-footer {
-	border-top: none;
-	background-color: @grayDarker;
-	.box-shadow(none);
+.footer {
+	border-top: 1px solid darken(@grayDarker, 5%);
+
+	p {
+		color: @textColor;
+	}
 }
 
-// MISCELLANEOUS
-// -----------------------------------------------------
+.modal {
 
-code, pre {
-	background-color: #F7F7F7;
-	border: 1px solid darken(@grayDarker, 5%);
-	text-shadow: none;
-}
+	background-color: darken(@grayDark, 5%);
 
-hr, legend, .page-header, .dropdown-menu .divider {
-	border-top: none;
-	border-bottom: 1px solid darken(@grayDarker, 5%);
-	background-color: transparent;
-}
+	&-header {
+		border-bottom: none;
+	}
 
-footer.footer {
-	border-top: 1px solid darken(@grayDarker, 5%);
+	&-body {
+		border-bottom: 1px solid #1C1E22;
+	}
 
-	p {
-		color: @textColor;
+	&-footer {
+		border-top: none;
+		background-color: @grayDarker;
+		.box-shadow(none);
 	}
 }
 
-.well, .progress, .hero-unit {
-	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
-}
+// MEDIA QUERIES
+// -----------------------------------------------------
 
-.progress {
-	background-color: darken(@grayDarker, 3%);
-	#gradient > .vertical(darken(@grayDarker, 3%), darken(@grayDarker, 3%));
+@media (max-width: 979px) {
+	.navbar .brand {
+		border-right: none;
+	}
 }
 
-.thumbnail, a.thumbnail:hover {
-  border: 1px solid darken(@grayDarker, 5%);
-}
+@media (max-width: 768px) {
+	div.subnav .nav > li + li > a {
+		border-top: 1px solid transparent;
+	}
+}
\ No newline at end of file