From de8e598ef1fbb71e87af79f6d1cce729b93525d8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 30 Mar 2017 10:28:51 +0800 Subject: [PATCH] upgrade normalize.css to 6.0.0 manually, close #5561 --- components/style/core/normalize.less | 62 +++++++--------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/components/style/core/normalize.less b/components/style/core/normalize.less index 8542f290de..4b0603824a 100644 --- a/components/style/core/normalize.less +++ b/components/style/core/normalize.less @@ -1,33 +1,23 @@ -/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ /** - * 1. Change the default font family in all browsers (opinionated). - * 2. Correct the line height in all browsers. - * 3. Prevent adjustments of font size after orientation changes in + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in * IE on Windows Phone and in iOS. */ -/* Document - ========================================================================== */ - html { - font-family: sans-serif; /* 1 */ - line-height: 1.15; /* 2 */ - -ms-text-size-adjust: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 3 */ + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } /* Sections ========================================================================== */ -/** - * Remove the margin in all browsers (opinionated). - */ - -body { - margin: 0; -} - /** * Add the correct display in IE 9-. */ @@ -90,7 +80,7 @@ hr { */ pre { - font-family: monospace, monospace; /* 1 */ /* stylelint-disable-line font-family-no-duplicate-names */ + font-family: monospace, monospace; /* 1 */ /* stylelint-disable-line */ font-size: 1em; /* 2 */ } @@ -108,17 +98,7 @@ a { } /** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - -/** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -154,7 +134,7 @@ strong { code, kbd, samp { - font-family: monospace, monospace; /* 1 */ /* stylelint-disable-line font-family-no-duplicate-names */ + font-family: monospace, monospace; /* 1 */ /* stylelint-disable-line */ font-size: 1em; /* 2 */ } @@ -245,8 +225,7 @@ svg:not(:root) { ========================================================================== */ /** - * 1. Change the font styles in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. + * Remove the margin in Firefox and Safari. */ button, @@ -254,10 +233,7 @@ input, optgroup, select, textarea { - font-family: sans-serif; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ + margin: 0; } /** @@ -316,16 +292,6 @@ button:-moz-focusring, outline: 1px dotted ButtonText; } -/** - * Change the border, margin, and padding in all browsers (opinionated). - */ - -fieldset { - border: @border-width-base @border-style-base #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - /** * 1. Correct the text wrapping in Edge and IE. * 2. Correct the color inheritance from `fieldset` elements in IE.