Merge branch 'v4-dev' into v4-navbars

1 files changed, 16 insertions, 6 deletions

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 263a8bc15..be19a0795 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -18,8 +18,16 @@
   background-image: none;
   background-clip: padding-box;
   border: $input-btn-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);
+  @if $enable-rounded {
+    // Manually use the if/else instead of the mixin to account for iOS override
+    border-radius: $input-border-radius;
+  } @else {
+    // Otherwise undo the iOS default
+    border-radius: 0;
+  }
+
   @include box-shadow($input-box-shadow);
   @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
 
@@ -58,7 +66,8 @@
 
 select.form-control {
   &:not([size]):not([multiple]) {
-    height: $input-height;
+    $select-border-width: ($border-width * 2);
+    height: calc(#{$input-height} - #{$select-border-width});
   }
 
   &:focus::-ms-value {
@@ -124,12 +133,11 @@ select.form-control {
 // horizontal form layout.
 
 .form-control-static {
-  min-height: $input-height;
-  // Size it appropriately next to real form controls
   padding-top: $input-padding-y;
   padding-bottom: $input-padding-y;
-  // Remove default margin from `p`
-  margin-bottom: 0;
+  line-height: $input-line-height;
+  border: solid transparent;
+  border-width: 1px 0;
 
   &.form-control-sm,
   &.form-control-lg {
@@ -239,6 +247,7 @@ select.form-control-lg {
   }
 
   &.disabled {
+    color: $text-muted;
     cursor: $cursor-disabled;
   }
 }
@@ -321,6 +330,7 @@ select.form-control-lg {
 
     .input-group {
       display: inline-table;
+      width: auto;
       vertical-align: middle;
 
       .input-group-addon,