1 files changed, 74 insertions, 35 deletions

diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index d2db1c3e..3f350a4d 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -36,7 +36,7 @@ blockquote {
 }
 
 .muted {
-	color: rgba(255, 255, 255, 0.5);
+	color: rgba(255, 255, 255, 0.6);
 }
 
 // SCAFFOLDING
@@ -216,56 +216,69 @@ div.subnav {
 // NAV
 // -----------------------------------------------------
 
-.nav-tabs li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-	background-color: #8AD5DC;
-	color: @linkColor;
-	border-color: transparent;
-}
+.nav-tabs,
+.nav-pills {
 
-.nav-tabs, .nav-pills {
 	border-color: transparent;
 
-	li > a {
+
+	& > li > a {
 		border-color: transparent;
 		.border-radius(0);
 		.box-shadow(0);
 	}
 
-	li.active > a,
-	li.active > a:hover {
-		color: @textColor;
+	& > li > a:hover {
+		background-color: #8AD5DC;
+		border-color: transparent;
+		text-shadow: none;
 	}
 
-	li.active > a,
-	li > a:hover,
-	li.active > a:hover {
+	& > .active > a,
+	& > .active > a:hover {
 		background-color: #8AD5DC;
 		border-color: transparent;
+		color: @textColor;
 		text-shadow: none;
 	}
-}
 
-.nav-tabs, .nav-tabs > li > a {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-}
+	& > .disabled > a,
+	& > .disabled > a:hover {
+		background: none;
+		color: @grayLighter;
+	}
+
+	& > .open > .dropdown-toggle,
+	& > .open > .dropdown-toggle {
+		background-color: #8AD5DC;
+		color: @linkColor;
+		border-color: transparent;
+	}
+
 
-.nav-tabs > li > a {
-	background-color: #3CB9C6;
 }
 
-.nav-tabs.nav-stacked {
+.nav-tabs {
 
-	li > a:first-child,
-	li > a:last-child {
-		.border-radius(0);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+
+	& > li > a  {
+		background-color: #3CB9C6;
 	}
 
-	li > a,
-	li > a:hover,
-	li.active > a,
-	li.active > a:hover {
-		border-color: transparent;
+	&.nav-stacked {
+
+		li > a:first-child,
+		li > a:last-child {
+			.border-radius(0);
+		}
+
+		li > a,
+		li > a:hover,
+		li.active > a,
+		li.active > a:hover {
+			border-color: transparent;
+		}
 	}
 }
 
@@ -301,6 +314,7 @@ div.subnav {
 }
 
 .breadcrumb {
+
 	background-color: #3CB9C6;
 	background-image: none;
 
@@ -312,8 +326,9 @@ div.subnav {
 		color: @white;
 	}
 
-	.divider {
-		color: @linkColor;
+	& > li > a.divider,
+	& > li > span.divider {
+		color: @grayLighter;
 	}
 }
 
@@ -501,8 +516,8 @@ legend {
 }
 
 legend, label, .help-block, .input-file {
-	color: @textColor;
 	border: 0px solid transparent;
+	color: inherit;
 }
 
 input, textarea, .uneditable-input {
@@ -534,11 +549,27 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .control-group.warning {
+  .formFieldState(@yellow, lighten(@yellow, 30%), @warningBackground);
+}
+
+.control-group.error {
+  .formFieldState(@orange, lighten(@orange, 30%), @errorBackground);
+}
+
+.control-group.success {
+  .formFieldState(@green, lighten(@green, 20%), @successBackground);
+}
+
+.control-group.info {
+  .formFieldState(@purple, lighten(@purple, 20%), @infoBackground);
+}
+
+.control-group.warning {
 
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten(@orange, 30%);
+		color: lighten(@yellow, 30%);
 	}
 }
 
@@ -547,7 +578,7 @@ input, textarea, .search-query, .uneditable-input,
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten(@linkColor, 10%);
+		color: lighten(@orange, 30%);
 	}
 }
 
@@ -559,6 +590,14 @@ input, textarea, .search-query, .uneditable-input,
 		color: lighten(@green, 20%);
 	}
 }
+.control-group.info {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten(@purple, 20%);
+	}
+}
 
 .input-prepend .add-on,
 .input-append .add-on {