1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 21:22:52 +02:00

Merge pull request #19001 from twbs/bump-normalize

Bump Normalize so we can remove Reboot's input[type=search] box-sizing override
This commit is contained in:
Chris Rebert
2016-01-23 22:11:27 -08:00
2 changed files with 3 additions and 8 deletions

View File

@@ -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. // 1. Set default font family to sans-serif.
@@ -37,7 +37,6 @@ figcaption,
figure, figure,
footer, footer,
header, header,
hgroup,
main, main,
menu, menu,
nav, nav,
@@ -353,13 +352,11 @@ input[type="number"]::-webkit-outer-spin-button {
} }
// //
// 1. Address `appearance` set to `searchfield` in Safari and Chrome. // Address `appearance` set to `searchfield` in Safari and Chrome.
// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
// //
input[type="search"] { input[type="search"] {
-webkit-appearance: textfield; // 1 -webkit-appearance: textfield;
box-sizing: content-box; //2
} }
// //

View File

@@ -331,8 +331,6 @@ legend {
} }
input[type="search"] { 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 // 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 // `.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 // be added to `.form-control` as it's not specific enough. For details, see