From 59d067925084aa8bb5b5b9fa775fa6be85d64937 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 2 Oct 2016 18:28:37 -0700
Subject: [PATCH] Only override input border-radius as part of .form-control to
 avoid bug with iOS Safari (alt fix for #20247) (#20695)

---
 scss/_forms.scss  | 10 +++++++++-
 scss/_reboot.scss |  2 --
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 6ea5d3dbc6..59465ee6c9 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);
 
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 1a1e4728b5..a24c3d3fae 100644
--- 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"],