]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fixes #5912: User correct selector for form field states.
authorMark Otto <otto@github.com>
Fri, 16 Nov 2012 09:16:27 +0000 (01:16 -0800)
committerMark Otto <otto@github.com>
Fri, 16 Nov 2012 09:16:27 +0000 (01:16 -0800)
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.

docs/assets/css/bootstrap.css
less/mixins.less

index d3490f856daa2bfbd4803c4a0a0870605bcf1bd9..b051c77ccd7d9b3b8771e47e10b9af1df29c3257 100644 (file)
@@ -1432,7 +1432,7 @@ input[type="checkbox"][readonly] {
   background-color: transparent;
 }
 
-.control-group.warning label,
+.control-group.warning .control-label,
 .control-group.warning .help-block,
 .control-group.warning .help-inline {
   color: #c09853;
@@ -1471,7 +1471,7 @@ input[type="checkbox"][readonly] {
   border-color: #c09853;
 }
 
-.control-group.error label,
+.control-group.error .control-label,
 .control-group.error .help-block,
 .control-group.error .help-inline {
   color: #b94a48;
@@ -1510,7 +1510,7 @@ input[type="checkbox"][readonly] {
   border-color: #b94a48;
 }
 
-.control-group.success label,
+.control-group.success .control-label,
 .control-group.success .help-block,
 .control-group.success .help-inline {
   color: #468847;
@@ -1549,7 +1549,7 @@ input[type="checkbox"][readonly] {
   border-color: #468847;
 }
 
-.control-group.info label,
+.control-group.info .control-label,
 .control-group.info .help-block,
 .control-group.info .help-inline {
   color: #3a87ad;
index 98aa2b8a5838fbf16b0d3640fb4ef1f14c3b7be3..b734bab2dc4c589dad2492b73107b960c2fdd3f6 100644 (file)
 // Mixin for form field states
 .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
   // Set the text color
-  label,
+  .control-label,
   .help-block,
   .help-inline {
     color: @textColor;