diff options
| author | Chris Rebert <[email protected]> | 2016-01-23 22:11:27 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-23 22:11:27 -0800 |
| commit | d54d9d3f7a8a6267efabf23d9672f80a9bd6f5fb (patch) | |
| tree | 103fa2a5a933f495a30aec6722788c821e722a81 | |
| parent | 3a20ae2b5ef7355aca5814c999fd78b56aea7ebb (diff) | |
| parent | 739b51f2643a478acbf8d47ab52e968ce0242112 (diff) | |
| download | bootstrap-d54d9d3f7a8a6267efabf23d9672f80a9bd6f5fb.tar.xz bootstrap-d54d9d3f7a8a6267efabf23d9672f80a9bd6f5fb.zip | |
Merge pull request #19001 from twbs/bump-normalize
Bump Normalize so we can remove Reboot's input[type=search] box-sizing override
| -rw-r--r-- | scss/_normalize.scss | 9 | ||||
| -rw-r--r-- | scss/_reboot.scss | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/scss/_normalize.scss b/scss/_normalize.scss index 2e62b53ec..93dd45217 100644 --- a/scss/_normalize.scss +++ b/scss/_normalize.scss @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */ // // 1. Set default font family to sans-serif. @@ -37,7 +37,6 @@ figcaption, figure, footer, header, -hgroup, main, menu, nav, @@ -353,13 +352,11 @@ input[type="number"]::-webkit-outer-spin-button { } // -// 1. Address `appearance` set to `searchfield` in Safari and Chrome. -// 2. Address `box-sizing` set to `border-box` in Safari and Chrome. +// Address `appearance` set to `searchfield` in Safari and Chrome. // input[type="search"] { - -webkit-appearance: textfield; // 1 - box-sizing: content-box; //2 + -webkit-appearance: textfield; } // diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 5b0f09bbe..1920474a9 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -331,8 +331,6 @@ legend { } input[type="search"] { - // Undo Normalize's default here to match our global overrides. - box-sizing: inherit; // This overrides the extra rounded corners on search inputs in iOS so that our // `.form-control` class can properly style them. Note that this cannot simply // be added to `.form-control` as it's not specific enough. For details, see |