Merge master

2012-12-11 16:19:08 -06:00
parent 4183060c6f e3f7365ec6
commit 906744589d
50 changed files with 1290 additions and 408 deletions
--- a/assets/css/less/bootstrap/mixins.less
+++ b/assets/css/less/bootstrap/mixins.less
@@ -163,7 +163,7 @@
 // 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;