spruce: fix color on control-label states

3 files changed, 27 insertions, 9 deletions

diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
index 9bfa3bb3..e870c21f 100644
--- a/spruce/bootstrap.css
+++ b/spruce/bootstrap.css
@@ -5503,7 +5503,11 @@ select {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.control-group.error label,
+.control-group.warning .control-label,
+.control-group.error .control-label,
+.control-group.success .control-label {
+  color: #555555;
+}
 .control-group.error .help-block,
 .control-group.error .help-inline {
   color: #d14432;
@@ -5514,7 +5518,6 @@ select {
   border: 1px solid #d14432;
   color: #555555;
 }
-.control-group.success label,
 .control-group.success .help-block,
 .control-group.success .help-inline {
   color: #015b4e;
@@ -5525,7 +5528,6 @@ select {
   border: 1px solid #015b4e;
   color: #555555;
 }
-.control-group.warning label,
 .control-group.warning .help-block,
 .control-group.warning .help-inline {
   color: #f26522;
diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
index 98a9780d..557b8bb4 100644
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.css
@@ -913,11 +913,12 @@ label,.help-block,input[type="file"]{color:#333333;}
 input,textarea,select{color:#555555;}
 .uneditable-input{color:#555555;}
 .form-actions{border-top:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.control-group.error label,.control-group.error .help-block,.control-group.error .help-inline{color:#d14432;}
+.control-group.warning .control-label,.control-group.error .control-label,.control-group.success .control-label{color:#555555;}
+.control-group.error .help-block,.control-group.error .help-inline{color:#d14432;}
 .control-group.error input,.control-group.error select,.control-group.error textarea{border:1px solid #d14432;color:#555555;}
-.control-group.success label,.control-group.success .help-block,.control-group.success .help-inline{color:#015b4e;}
+.control-group.success .help-block,.control-group.success .help-inline{color:#015b4e;}
 .control-group.success input,.control-group.success select,.control-group.success textarea{border:1px solid #015b4e;color:#555555;}
-.control-group.warning label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#f26522;}
+.control-group.warning .help-block,.control-group.warning .help-inline{color:#f26522;}
 .control-group.warning input,.control-group.warning select,.control-group.warning textarea{border:1px solid #f26522;color:#555555;}
 .alert{text-shadow:none;border:none;}.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{font-weight:bold;color:#ffffff;}
 .alert-heading{font-family:Georgia,"Times New Roman",Times,serif;color:inherit;}
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index 101c59cf..9476b64b 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -499,9 +499,22 @@ input, textarea, select {
 	.border-radius(4px);
 }
 
+.control-group {
+
+	&.warning,
+	&.error,
+	&.success {
+
+		.control-label {
+			color: @textColor;
+		}
+	}
+}
+
 .control-group.error {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: @red;
 	}
 
@@ -513,7 +526,8 @@ input, textarea, select {
 
 .control-group.success {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: @green;
 	}
 
@@ -525,7 +539,8 @@ input, textarea, select {
 
 .control-group.warning {
 
-	label, .help-block, .help-inline {
+	.help-block,
+	.help-inline {
 		color: @orange;
 	}