Only override input border-radius as part of .form-control to avoid bug with iOS...

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 6ea5d3dbc6922a1c5f91264bf601660ea30dbd60..59465ee6c913e490926628f2a3149ba842d84cb5 100644 (file)
--- 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);
 

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 1a1e4728b5fbddb251d686d6354a727bfe423c7d..a24c3d3fae5a5522bbb3c4dea7812cf3a7fd75a7 100644 (file)
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -318,8 +318,6 @@ textarea {
   // properly inherited. However, `line-height` isn't addressed there. Using this
   // ensures we don't need to unnecessarily redeclare the global font stack.
   line-height: inherit;
-  // iOS adds rounded borders by default
-  border-radius: 0;
 }
 
 input[type="radio"],