From beeafc280836b347b63197a7136910bc7725f08c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 21 Jan 2016 14:28:41 -0800 Subject: [PATCH 1/2] Bump Normalize to https://github.com/necolas/normalize.css/commit/fe567632afcf8afcf17925ab2a507ed87504cce8 So as to pull in https://github.com/necolas/normalize.css/pull/496 --- scss/_normalize.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scss/_normalize.scss b/scss/_normalize.scss index 2e62b53ecf..93dd452172 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; } // From 739b51f2643a478acbf8d47ab52e968ce0242112 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 21 Jan 2016 14:38:22 -0800 Subject: [PATCH 2/2] Reboot: Remove now-unnecessary input[type="search"] box-sizing override Revert "fixes #17379: override search input box-sizing to match our global overrides" This reverts commits 468a9d9359a1008675b2c19a1fae1d9016a7686d & 57998dc274a06b64d4caeda372aeea7b9d1af3ee. https://github.com/necolas/normalize.css/pull/496 has made this override unnecessary. [skip sauce] --- scss/_reboot.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 5b0f09bbe4..1920474a96 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