spruce: fix color on control-label states

donn1e · Jan 27, 2013 · 664fea0 · 664fea0
1 parent 489a0d3
commit 664fea0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git 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
diff --git 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;
 	}