move formfieldstate mixin to mixins.less for #1785

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 707487f67c8afad856eeef33762d472c95e9bc08..d079b7cc5fb0053350e1c281682dff750276265a 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/less/forms.less b/less/forms.less
index 3f68df01c4f1b43e7f511cd15b8d9540281954f3..5bce4cebd4d998d68269992daf6dbea876ea41b1 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -259,33 +259,6 @@ textarea[readonly] {
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  input,
-  select,
-  textarea {
-    color: @textColor;
-    border-color: @borderColor;
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      .box-shadow(0 0 6px lighten(@borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
 // Warning
 .control-group.warning {
   .formFieldState(@warningText, @warningText, @warningBackground);

diff --git a/less/mixins.less b/less/mixins.less
index 2b96d21e5909de3a7528ca84d3ca9ca1d4a059cd..fffb6c1ceb3039a426e99675e121e770ed112fc9 100644 (file)
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -244,8 +244,6 @@
   }
 }
 
-
-
 // Input grid system
 // -------------------------
 #inputGridSystem {
@@ -274,6 +272,39 @@
 
 
 
+// Form field states (used in forms.less)
+// --------------------------------------------------
+
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  input,
+  select,
+  textarea {
+    color: @textColor;
+    border-color: @borderColor;
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      .box-shadow(0 0 6px lighten(@borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
+
+
+
 // CSS3 PROPERTIES
 // --------------------------------------------------