1 files changed, 76 insertions, 47 deletions

diff --git a/slate/bootswatch.less b/slate/bootswatch.less
index 95af73e2..09079902 100755
--- a/slate/bootswatch.less
+++ b/slate/bootswatch.less
@@ -69,6 +69,11 @@ hr, legend, .page-header {
 		border: 1px solid darken(@gray, 15%);
 	}
 
+	.btn,
+	.btn-group {
+		margin: 4px 0;
+	}
+
 	.divider-vertical {
 		background-color: transparent;
 		border-right: none;
@@ -194,29 +199,33 @@ div.subnav {
 // NAV
 // -----------------------------------------------------
 
-.nav .nav-header {
-	text-shadow: none;
-}
+.nav {
 
-.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);
-}
+	.nav-header {
+		text-shadow: none;
+	}
 
-.nav > li.active > a,
-.nav > li.active > a:hover {
-	background-color: transparent;
-	border: none;
-	color: @white;
-}
+	& > 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);
+	}
+
+	li.active > a,
+	li.active > a:hover {
+		background-color: transparent;
+		border: none;
+		color: @white;
+	}
+
+	li > a:hover {
+		background-color: transparent;
+		color: @grayLighter;
+	}
 
-.nav > li > a:hover {
-	background-color: transparent;
-	color: @grayLighter;
 }
 
 .nav-list {
@@ -255,9 +264,20 @@ div.subnav {
 	border-left: none;
 }
 
-.nav-tabs.nav-stacked > li > a,
-.nav-tabs.nav-stacked > li > a:hover {
-	border: none;
+.nav-tabs.nav-stacked {
+
+	li > a,
+	li > a:hover {
+		border: 1px solid darken(@grayDarker, 5%);
+		background-image: none;
+	}
+
+	li > a:hover,
+	.active > a,
+	.active > a:hover {
+		background-color: @wellBackground;
+		color: @white;
+	}
 }
 
 .breadcrumb {
@@ -325,16 +345,17 @@ div.subnav {
 
 .pager {
 
-	a {
+	li > a,
+	li > span {
 		border: 1px solid transparent;
 		.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
 		#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
-	}	
 
-	a:hover {
-		#gradient > .directional(@grayDarker, @grayDark, 280deg);
-		border: 1px solid transparent;
-	}
+		&:hover {
+			#gradient > .directional(@grayDarker, @grayDark, 280deg);
+			border: 1px solid transparent;
+		}
+	}	
 
 	.disabled a,
 	.disabled a:hover {
@@ -354,31 +375,33 @@ div.subnav {
 .btn, .btn:hover {
 	color: @white;
 	font-weight: bold;
-	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+	text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.3);
 }
 
 .btn-primary {
-  .buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
+	.buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
+	color: @grayDark;
+	text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.3);
 }
 
 .btn-warning {
-  .buttonBackground(lighten(@orange, 15%), @orange);
+	.buttonBackground(lighten(@orange, 15%), @orange);
 }
 
 .btn-danger {
-  .buttonBackground(#ee5f5b, #bd362f);
+	.buttonBackground(@red, #bd362f);
 }
 
 .btn-success {
-  .buttonBackground(#62c462, #51a351);
+	.buttonBackground(@green, #51a351);
 }
 
 .btn-info {
-  .buttonBackground(#5bc0de, #2f96b4);
+	.buttonBackground(@blue, #2f96b4);
 }
 
 .btn-inverse {
-  .buttonBackground(#454545, #262626);
+	.buttonBackground(@gray, @grayDarker);
 }
 
 .caret {
@@ -388,6 +411,23 @@ div.subnav {
 // TABLES
 // -----------------------------------------------------
 
+.table {
+
+	tbody tr.success td {
+		background-color: @successText;
+	}
+
+	tbody tr.error td {
+		background-color: @errorText;
+	}
+
+	tbody tr.info td {
+		background-color: @infoText;
+	}
+
+}
+
+
 // FORMS
 // -----------------------------------------------------
 
@@ -435,11 +475,6 @@ textarea[readonly] {
 
 .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 {
@@ -447,12 +482,6 @@ textarea[readonly] {
 	color: @grayLighter;
 }
 
-.dropdown-menu .divider {
-	border-top: none;
-	border-bottom: 1px solid darken(@grayDarker, 5%);
-	background-color: transparent;
-}
-
 .dropdown-submenu > a::after {
 	border-left-color: @white;
 }