1 files changed, 23 insertions, 18 deletions

diff --git a/src/forms.less b/src/forms.less
index bc9b571..7ed91e6 100644
--- a/src/forms.less
+++ b/src/forms.less
@@ -81,7 +81,7 @@ legend {
 
   // Input types
   &[type="file"] {
-    padding: .125rem;
+    height: auto;
   }
 }
 
@@ -93,12 +93,12 @@ legend {
 
   .has-success &,
   .is-success + & {
-    color: @control-color-success;
+    color: @success-color;
   }
 
   .has-error &,
   .is-error + & {
-    color: @control-color-error;
+    color: @error-color;
   }
 }
 
@@ -359,9 +359,14 @@ legend {
       padding: @control-padding-v-lg @control-padding-h;
     }
   }
-  .input-group-addon,
+
+  .form-input,
+  .form-select {
+    flex: 1 1 auto;
+  }
+
   .input-group-btn {
-    flex: 1 0 auto;
+    z-index: @zindex-0;
   }
 
   .form-input,
@@ -382,7 +387,7 @@ legend {
       margin-left: -@border-width;
     }
     &:focus {
-      z-index: @zindex-0;
+      z-index: @zindex-0 + 1;
     }
   }
 
@@ -400,17 +405,17 @@ legend {
 .form-select {
   .has-success &,
   &.is-success {
-    border-color: @control-color-success;
+    border-color: @success-color;
     &:focus {
-      .control-shadow(@control-color-success);
+      .control-shadow(@success-color);
     }
   }
 
   .has-error &,
   &.is-error {
-    border-color: @control-color-error;
+    border-color: @error-color;
     &:focus {
-      .control-shadow(@control-color-error);
+      .control-shadow(@error-color);
     }
   }
 }
@@ -421,18 +426,18 @@ legend {
   .has-error &,
   &.is-error {
     .form-icon {
-      border-color: @control-color-error;
+      border-color: @error-color;
     }
     
     input {
       &:checked + .form-icon {
-        background: @control-color-error;
-        border-color: @control-color-error;
+        background: @error-color;
+        border-color: @error-color;
       }
 
       &:focus + .form-icon {
-        border-color: @control-color-error;
-        .control-shadow(@control-color-error);
+        border-color: @error-color;
+        .control-shadow(@error-color);
       }
     }
   }
@@ -442,13 +447,13 @@ legend {
 .form-input {
   &:not(:placeholder-shown) {
     &:invalid {
-      border-color: @control-color-error;
+      border-color: @error-color;
       &:focus {
-        .control-shadow(@control-color-error);
+        .control-shadow(@error-color);
       }
 
       & + .form-input-hint {
-        color: @control-color-error;
+        color: @error-color;
       }
     }
   }