Skip to content

Commit 59d0679

Browse files
authored
Only override input border-radius as part of .form-control to avoid bug with iOS Safari (alt fix for twbs#20247) (twbs#20695)
1 parent 18b14d3 commit 59d0679

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

scss/_forms.scss

+9-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,16 @@
1818
background-image: none;
1919
background-clip: padding-box;
2020
border: $input-btn-border-width solid $input-border-color;
21+
2122
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
22-
@include border-radius($input-border-radius);
23+
@if $enable-rounded {
24+
// Manually use the if/else instead of the mixin to account for iOS override
25+
border-radius: $input-border-radius;
26+
} @else {
27+
// Otherwise undo the iOS default
28+
border-radius: 0;
29+
}
30+
2331
@include box-shadow($input-box-shadow);
2432
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
2533

scss/_reboot.scss

-2
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ textarea {
318318
// properly inherited. However, `line-height` isn't addressed there. Using this
319319
// ensures we don't need to unnecessarily redeclare the global font stack.
320320
line-height: inherit;
321-
// iOS adds rounded borders by default
322-
border-radius: 0;
323321
}
324322

325323
input[type="radio"],

0 commit comments

Comments
 (0)