Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1

1 files changed, 13 insertions, 13 deletions

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 7879f6384..942fea51a 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -14,14 +14,14 @@
   background-color: $input-bg;
   // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
   background-image: none;
-  border: $border-width solid $input-border;
-   // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
+  border: $input-border-width solid $input-border-color;
+  // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
   @include border-radius($input-border-radius);
   @include box-shadow($input-box-shadow);
   @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
 
   // Make inputs at least the height of their button counterpart (base line-height + padding + border).
-  // Only apply the height to textual inputs and some selcts.
+  // Only apply the height to textual inputs and some selects.
   // &:not(textarea),
   // &:not(select[size]),
   // &:not(select[multiple]) {
@@ -76,7 +76,7 @@
 // For use with horizontal and inline forms, when you need the label text to
 // align with the form controls.
 .form-control-label {
-  padding: ($input-padding-y + $border-width) $input-padding-x;
+  padding: $input-padding-y $input-padding-x;
   margin-bottom: 0; // Override the `<label>` default
 }
 
@@ -89,6 +89,8 @@
 // text within the input to become vertically misaligned. As a workaround, we
 // set a pixel line-height that matches the given height of the input, but only
 // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
+//
+// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
 
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
   input[type="date"],
@@ -120,8 +122,8 @@
 .form-control-static {
   min-height: $input-height;
   // Size it appropriately next to real form controls
-  padding-top: ($input-padding-y + $border-width);
-  padding-bottom: ($input-padding-y + $border-width);
+  padding-top: $input-padding-y;
+  padding-bottom: $input-padding-y;
   // Remove default margin from `p`
   margin-bottom: 0;
 
@@ -259,7 +261,7 @@ input[type="checkbox"] {
 
 .form-control-success,
 .form-control-warning,
-.form-control-error {
+.form-control-danger {
   padding-right: ($input-padding-x * 3);
   background-repeat: no-repeat;
   background-position: center right ($input-height * .25);
@@ -283,11 +285,11 @@ input[type="checkbox"] {
   }
 }
 
-.has-error {
+.has-danger {
   @include form-control-validation($brand-danger);
 
-  .form-control-error {
-    background-image: url($form-icon-error);
+  .form-control-danger {
+    background-image: url($form-icon-danger);
   }
 }
 
@@ -352,7 +354,7 @@ input[type="checkbox"] {
 // .has-warning {
 //   @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg);
 // }
-// .has-error {
+// .has-danger {
 //   @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
 // }
 //
@@ -378,8 +380,6 @@ input[type="checkbox"] {
 //
 // Requires wrapping inputs and labels with `.form-group` for proper display of
 // default HTML form controls and our custom form controls (e.g., input groups).
-//
-// Heads up! This is mixin-ed into `.navbar-form` in _navbar.scss.
 
 .form-inline {