From 4cec34d99037f1af4904ff9a9fb2f8a7f9a8de05 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 12 Sep 2012 21:56:37 +0800 Subject: [PATCH 01/25] add normalize.scss scss file Signed-off-by: Bo-Yi Wu --- normalize.scss | 512 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 512 insertions(+) create mode 100644 normalize.scss diff --git a/normalize.scss b/normalize.scss new file mode 100644 index 000000000..a1ececcfc --- /dev/null +++ b/normalize.scss @@ -0,0 +1,512 @@ +/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ + +/* ========================================================================== + HTML5 display definitions + ========================================================================== */ + +$legacy_browser_support: true; + +/* + * Corrects `block` display not defined in IE 8/9. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section, +summary { + display: block; +} + +/* + * Corrects `inline-block` display not defined in IE 8/9. + */ + +audio, +canvas, +video { + display: inline-block; + @if $legacy_browser_support { + *display: inline; + *zoom: 1; + } +} + +/* + * Prevents modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/* + * Addresses styling for `hidden` attribute not present in IE 8/9. + */ + +[hidden] { + display: none; +} + +/* ========================================================================== + Base + ========================================================================== */ + +/* + * 1. Sets default font family to sans-serif. + * 2. Prevents iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + @if $legacy_browser_support { + font-size: 100%; /* 1 */ + } + font-family: sans-serif; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ +} + +/* + * Removes default margin. + */ + +body { + margin: 0; +} + +/* ========================================================================== + Links + ========================================================================== */ + +/* + * Addresses `outline` inconsistency between Chrome and other browsers. + */ + +/* + * Improves readability when focused and also mouse hovered in all browsers. + */ + +a { + &:focus { + outline: thin dotted; + } + &:active, &:hover { + outline: 0; + }; +} + + +/* ========================================================================== + Typography + ========================================================================== */ + +/* + * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, + * Safari 5, and Chrome. + */ + +h1 { + font-size: 2em; + @if $legacy_browser_support { + margin: 0.67em 0; + } +} + +@if $legacy_browser_support { + h2 { + font-size: 1.5em; + margin: 0.83em 0; + } + + h3 { + font-size: 1.17em; + margin: 1em 0; + } + + h4 { + font-size: 1em; + margin: 1.33em 0; + } + + h5 { + font-size: 0.83em; + margin: 1.67em 0; + } + + h6 { + font-size: 0.75em; + margin: 2.33em 0; + } +} + +/* + * Addresses styling not present in IE 8/9, Safari 5, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/* + * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +@if $legacy_browser_support { + blockquote { + margin: 1em 40px; + } +} + +/* + * Addresses styling not present in Safari 5 and Chrome. + */ + +dfn { + font-style: italic; +} + +/* + * Addresses styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + + +/* + * Corrects font family set oddly in Safari 5 and Chrome. + */ + +@if $legacy_browser_support { + p, + pre { + margin: 1em 0; + } +} + +code, +kbd, +pre, +samp { + font-family: monospace, serif; + @if $legacy_browser_support { + _font-family: 'courier new', monospace; + } + font-size: 1em; +} + +/* + * Improves readability of pre-formatted text in all browsers. + */ + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +/* + * Sets consistent quote types. + */ + +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} + +@if $legacy_browser_support { + /* + * Addresses CSS quotes not supported in IE 6/7. + */ + + q { + quotes: none; + } + + /* + * Addresses `quotes` property not supported in Safari 4. + */ + + q:before, + q:after { + content: ''; + content: none; + } +} + +/* + * Addresses inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/* + * Prevents `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +@if $legacy_browser_support { + + /* ========================================================================== + Lists + ========================================================================== */ + + /* + * Addresses margins set differently in IE 6/7. + */ + + dl, + menu, + ol, + ul { + margin: 1em 0; + } + + dd { + margin: 0 0 0 40px; + } + + /* + * Addresses paddings set differently in IE 6/7. + */ + + menu, + ol, + ul { + padding: 0 0 0 40px; + } + + /* + * Corrects list images handled incorrectly in IE 7. + */ + + nav ul, + nav ol { + list-style: none; + list-style-image: none; + } + +} + +/* ========================================================================== + Embedded content + ========================================================================== */ + +/* + * Removes border when inside `a` element in IE 8/9. + */ + +img { + border: 0; + @if $legacy_browser_support { + -ms-interpolation-mode: bicubic; /* 2 */ + } +} + +/* + * Corrects overflow displayed oddly in IE 9. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* ========================================================================== + Figures + ========================================================================== */ + +/* + * Addresses margin not present in IE 8/9 and Safari 5. + */ + +figure { + margin: 0; +} + +/* ========================================================================== + Forms + ========================================================================== */ + +/* + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/* + * 1. Corrects color not being inherited in IE 8/9. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + white-space: normal; /* 2 */ + *margin-left: -7px; /* 3 */ + } +} + +/* + * 1. Corrects font family not being inherited in all browsers. + * 2. Corrects font size not being inherited in all browsers. + * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome + */ + +button, +input, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ + @if $legacy_browser_support { + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ + } +} + +/* + * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +button, +input { + line-height: normal; +} + +/* + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Corrects inability to style clickable `input` types in iOS. + * 3. Improves usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ + @if $legacy_browser_support { + *overflow: visible; /* 4 */ + } +} + +/* + * Re-set default cursor for disabled elements. + */ + +button[disabled], +input[disabled] { + cursor: default; +} + +/* + * 1. Addresses box sizing set to `content-box` in IE 8/9. + * 2. Removes excess padding in IE 8/9. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ + } +} + +/* + * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/* + * Removes inner padding and search cancel button in Safari 5 and Chrome + * on OS X. + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* + * Removes inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/* + * 1. Removes default vertical scrollbar in IE 8/9. + * 2. Improves readability and alignment in all browsers. + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + +/* ========================================================================== + Tables + ========================================================================== */ + +/* + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} From 8ec277ce85efbbeeb71b637414e477c0df8aea26 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 12 Sep 2012 22:05:57 +0800 Subject: [PATCH 02/25] add legacy_browser_support variable Signed-off-by: Bo-Yi Wu --- normalize.scss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/normalize.scss b/normalize.scss index a1ececcfc..cec02dd9c 100644 --- a/normalize.scss +++ b/normalize.scss @@ -1,11 +1,18 @@ -/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ +/* ========================================================================== + Normalize.scss settings + ========================================================================== */ +/** + * Includes legacy browser support IE6/7 + * + * Set to false if you want to drop support for IE6 and IE7 + */ + +$legacy_browser_support: false; /* ========================================================================== HTML5 display definitions ========================================================================== */ -$legacy_browser_support: true; - /* * Corrects `block` display not defined in IE 8/9. */ From b70278dc14abad137275435561d8aab1d35c8e29 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 13 Sep 2012 09:38:29 +0800 Subject: [PATCH 03/25] add comment on scss file and merge new 2.0.1 and legacy 1.0.1 completely Signed-off-by: Bo-Yi Wu --- normalize.scss | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/normalize.scss b/normalize.scss index cec02dd9c..77ccbe0e4 100644 --- a/normalize.scss +++ b/normalize.scss @@ -32,7 +32,7 @@ summary { } /* - * Corrects `inline-block` display not defined in IE 8/9. + * Corrects `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. */ audio, @@ -71,6 +71,8 @@ audio:not([controls]) { * 1. Sets default font family to sans-serif. * 2. Prevents iOS text size adjust after orientation change, without disabling * user zoom. + * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. */ html { @@ -117,6 +119,7 @@ a { ========================================================================== */ /* + * Addresses font sizes and margins set differently in IE 6/7. * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, * Safari 5, and Chrome. */ @@ -164,7 +167,7 @@ abbr[title] { } /* - * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + * Addresses style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. */ b, @@ -195,9 +198,8 @@ mark { color: #000; } - /* - * Corrects font family set oddly in Safari 5 and Chrome. + * Addresses margins set differently in IE 6/7. */ @if $legacy_browser_support { @@ -207,6 +209,10 @@ mark { } } +/* + * Corrects font family set oddly in IE 6, Safari 4/5, and Chrome. + */ + code, kbd, pre, @@ -332,7 +338,8 @@ sub { ========================================================================== */ /* - * Removes border when inside `a` element in IE 8/9. + * 1. Removes border when inside `a` element in IE 6/7/8/9 and Firefox 3. + * 2. Improves image quality when scaled in IE 7. */ img { @@ -377,8 +384,10 @@ fieldset { } /* - * 1. Corrects color not being inherited in IE 8/9. + * 1. Corrects color not being inherited in IE 6/7/8/9. * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 3. Corrects text not wrapping in Firefox 3. + * 4. Corrects alignment displayed oddly in IE 6/7. */ legend { @@ -393,7 +402,8 @@ legend { /* * 1. Corrects font family not being inherited in all browsers. * 2. Corrects font size not being inherited in all browsers. - * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome + * 3. Addresses margins set differently IE 6/7, Firefox 3+, Safari 5, and Chrome + * 4. Improves appearance and consistency in all browsers. */ button, @@ -425,6 +435,8 @@ input { * 2. Corrects inability to style clickable `input` types in iOS. * 3. Improves usability and consistency of cursor style between image-type * `input` and others. + * 4. Removes inner spacing in IE 7 without affecting normal text inputs. + * Known issue: inner spacing remains in IE 6. */ button, @@ -450,6 +462,8 @@ input[disabled] { /* * 1. Addresses box sizing set to `content-box` in IE 8/9. * 2. Removes excess padding in IE 8/9. + * 3. Removes excess padding in IE 7. + * Known issue: excess padding remains in IE 6. */ input[type="checkbox"], From f86e7c9baf7dbe0c8c9e47aade456c500c768228 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Mon, 21 Jan 2013 12:13:22 +0800 Subject: [PATCH 04/25] update scss version of normalize.css to 2.1.0 Signed-off-by: Bo-Yi Wu --- normalize.scss | 156 ++++++++++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 67 deletions(-) diff --git a/normalize.scss b/normalize.scss index 77ccbe0e4..e6d17b069 100644 --- a/normalize.scss +++ b/normalize.scss @@ -25,14 +25,15 @@ figure, footer, header, hgroup, +main, nav, section, summary { display: block; } -/* - * Corrects `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. +/** + * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. */ audio, @@ -45,7 +46,7 @@ video { } } -/* +/** * Prevents modern browsers from displaying `audio` without controls. * Remove excess height in iOS 5 devices. */ @@ -56,7 +57,7 @@ audio:not([controls]) { } /* - * Addresses styling for `hidden` attribute not present in IE 8/9. + * Address styling not present in IE 8/9. */ [hidden] { @@ -67,9 +68,9 @@ audio:not([controls]) { Base ========================================================================== */ -/* - * 1. Sets default font family to sans-serif. - * 2. Prevents iOS text size adjust after orientation change, without disabling +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling * user zoom. * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. @@ -84,8 +85,8 @@ html { -ms-text-size-adjust: 100%; /* 2 */ } -/* - * Removes default margin. +/** + * Remove default margin. */ body { @@ -96,8 +97,8 @@ body { Links ========================================================================== */ -/* - * Addresses `outline` inconsistency between Chrome and other browsers. +/** + * Address `outline` inconsistency between Chrome and other browsers. */ /* @@ -118,14 +119,15 @@ a { Typography ========================================================================== */ -/* +/** * Addresses font sizes and margins set differently in IE 6/7. - * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, - * Safari 5, and Chrome. + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari 5, and Chrome. */ h1 { font-size: 2em; + margin: 0.67em 0; @if $legacy_browser_support { margin: 0.67em 0; } @@ -158,16 +160,16 @@ h1 { } } -/* - * Addresses styling not present in IE 8/9, Safari 5, and Chrome. +/** + * Address styling not present in IE 8/9, Safari 5, and Chrome. */ abbr[title] { border-bottom: 1px dotted; } -/* - * Addresses style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. +/** + * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. */ b, @@ -181,15 +183,25 @@ strong { } } -/* - * Addresses styling not present in Safari 5 and Chrome. +/** + * Address styling not present in Safari 5 and Chrome. */ dfn { font-style: italic; } -/* +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** * Addresses styling not present in IE 8/9. */ @@ -209,8 +221,8 @@ mark { } } -/* - * Corrects font family set oddly in IE 6, Safari 4/5, and Chrome. +/** + * Correct font family set oddly in Safari 5 and Chrome. */ code, @@ -224,18 +236,16 @@ samp { font-size: 1em; } -/* - * Improves readability of pre-formatted text in all browsers. +/** + * Improve readability of pre-formatted text in all browsers. */ pre { - white-space: pre; white-space: pre-wrap; - word-wrap: break-word; } -/* - * Sets consistent quote types. +/** + * Set consistent quote types. */ q { @@ -262,16 +272,16 @@ q { } } -/* - * Addresses inconsistent and variable font size in all browsers. +/** + * Address inconsistent and variable font size in all browsers. */ small { font-size: 80%; } -/* - * Prevents `sub` and `sup` affecting `line-height` in all browsers. +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. */ sub, @@ -337,8 +347,8 @@ sub { Embedded content ========================================================================== */ -/* - * 1. Removes border when inside `a` element in IE 6/7/8/9 and Firefox 3. +/** + * 1. Remove border when inside `a` element in IE 8/9. * 2. Improves image quality when scaled in IE 7. */ @@ -349,8 +359,8 @@ img { } } -/* - * Corrects overflow displayed oddly in IE 9. +/** + * Correct overflow displayed oddly in IE 9. */ svg:not(:root) { @@ -361,8 +371,8 @@ svg:not(:root) { Figures ========================================================================== */ -/* - * Addresses margin not present in IE 8/9 and Safari 5. +/** + * Address margin not present in IE 8/9 and Safari 5. */ figure { @@ -373,7 +383,7 @@ figure { Forms ========================================================================== */ -/* +/** * Define consistent border, margin, and padding. */ @@ -383,8 +393,8 @@ fieldset { padding: 0.35em 0.625em 0.75em; } -/* - * 1. Corrects color not being inherited in IE 6/7/8/9. +/** + * 1. Correct `color` not being inherited in IE 8/9. * 2. Remove padding so people aren't caught out if they zero out fieldsets. * 3. Corrects text not wrapping in Firefox 3. * 4. Corrects alignment displayed oddly in IE 6/7. @@ -399,10 +409,10 @@ legend { } } -/* - * 1. Corrects font family not being inherited in all browsers. - * 2. Corrects font size not being inherited in all browsers. - * 3. Addresses margins set differently IE 6/7, Firefox 3+, Safari 5, and Chrome +/** + * 1. Correct font family not being inherited in all browsers. + * 2. Correct font size not being inherited in all browsers. + * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. * 4. Improves appearance and consistency in all browsers. */ @@ -419,8 +429,8 @@ textarea { } } -/* - * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in * the UA stylesheet. */ @@ -429,11 +439,23 @@ input { line-height: normal; } -/* +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + +button, +select { + text-transform: none; +} + +/** * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` * and `video` controls. - * 2. Corrects inability to style clickable `input` types in iOS. - * 3. Improves usability and consistency of cursor style between image-type + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type * `input` and others. * 4. Removes inner spacing in IE 7 without affecting normal text inputs. * Known issue: inner spacing remains in IE 6. @@ -450,18 +472,18 @@ input[type="submit"] { } } -/* +/** * Re-set default cursor for disabled elements. */ button[disabled], -input[disabled] { +html input[disabled] { cursor: default; } -/* - * 1. Addresses box sizing set to `content-box` in IE 8/9. - * 2. Removes excess padding in IE 8/9. +/** + * 1. Address box sizing set to `content-box` in IE 8/9. + * 2. Remove excess padding in IE 8/9. * 3. Removes excess padding in IE 7. * Known issue: excess padding remains in IE 6. */ @@ -476,9 +498,9 @@ input[type="radio"] { } } -/* - * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome +/** + * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome * (include `-moz` to future-proof). */ @@ -489,8 +511,8 @@ input[type="search"] { box-sizing: content-box; } -/* - * Removes inner padding and search cancel button in Safari 5 and Chrome +/** + * Remove inner padding and search cancel button in Safari 5 and Chrome * on OS X. */ @@ -499,8 +521,8 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -/* - * Removes inner padding and border in Firefox 4+. +/** + * Remove inner padding and border in Firefox 4+. */ button::-moz-focus-inner, @@ -509,9 +531,9 @@ input::-moz-focus-inner { padding: 0; } -/* - * 1. Removes default vertical scrollbar in IE 8/9. - * 2. Improves readability and alignment in all browsers. +/** + * 1. Remove default vertical scrollbar in IE 8/9. + * 2. Improve readability and alignment in all browsers. */ textarea { @@ -523,7 +545,7 @@ textarea { Tables ========================================================================== */ -/* +/** * Remove most spacing between table cells. */ From 07fdcd9a76b181dad2f3201a57ae49fd79e57dc6 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Mon, 21 Jan 2013 12:35:33 +0800 Subject: [PATCH 05/25] convert to unix format Signed-off-by: Bo-Yi Wu --- normalize.scss | 1110 ++++++++++++++++++++++++------------------------ 1 file changed, 555 insertions(+), 555 deletions(-) diff --git a/normalize.scss b/normalize.scss index e6d17b069..fa9ce273c 100644 --- a/normalize.scss +++ b/normalize.scss @@ -1,555 +1,555 @@ -/* ========================================================================== - Normalize.scss settings - ========================================================================== */ -/** - * Includes legacy browser support IE6/7 - * - * Set to false if you want to drop support for IE6 and IE7 - */ - -$legacy_browser_support: false; - -/* ========================================================================== - HTML5 display definitions - ========================================================================== */ - -/* - * Corrects `block` display not defined in IE 8/9. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -nav, -section, -summary { - display: block; -} - -/** - * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. - */ - -audio, -canvas, -video { - display: inline-block; - @if $legacy_browser_support { - *display: inline; - *zoom: 1; - } -} - -/** - * Prevents modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/* - * Address styling not present in IE 8/9. - */ - -[hidden] { - display: none; -} - -/* ========================================================================== - Base - ========================================================================== */ - -/** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using - * `em` units. - */ - -html { - @if $legacy_browser_support { - font-size: 100%; /* 1 */ - } - font-family: sans-serif; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ -} - -/** - * Remove default margin. - */ - -body { - margin: 0; -} - -/* ========================================================================== - Links - ========================================================================== */ - -/** - * Address `outline` inconsistency between Chrome and other browsers. - */ - -/* - * Improves readability when focused and also mouse hovered in all browsers. - */ - -a { - &:focus { - outline: thin dotted; - } - &:active, &:hover { - outline: 0; - }; -} - - -/* ========================================================================== - Typography - ========================================================================== */ - -/** - * Addresses font sizes and margins set differently in IE 6/7. - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari 5, and Chrome. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; - @if $legacy_browser_support { - margin: 0.67em 0; - } -} - -@if $legacy_browser_support { - h2 { - font-size: 1.5em; - margin: 0.83em 0; - } - - h3 { - font-size: 1.17em; - margin: 1em 0; - } - - h4 { - font-size: 1em; - margin: 1.33em 0; - } - - h5 { - font-size: 0.83em; - margin: 1.67em 0; - } - - h6 { - font-size: 0.75em; - margin: 2.33em 0; - } -} - -/** - * Address styling not present in IE 8/9, Safari 5, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -@if $legacy_browser_support { - blockquote { - margin: 1em 40px; - } -} - -/** - * Address styling not present in Safari 5 and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; -} - -/** - * Addresses styling not present in IE 8/9. - */ - -mark { - background: #ff0; - color: #000; -} - -/* - * Addresses margins set differently in IE 6/7. - */ - -@if $legacy_browser_support { - p, - pre { - margin: 1em 0; - } -} - -/** - * Correct font family set oddly in Safari 5 and Chrome. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, serif; - @if $legacy_browser_support { - _font-family: 'courier new', monospace; - } - font-size: 1em; -} - -/** - * Improve readability of pre-formatted text in all browsers. - */ - -pre { - white-space: pre-wrap; -} - -/** - * Set consistent quote types. - */ - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - -@if $legacy_browser_support { - /* - * Addresses CSS quotes not supported in IE 6/7. - */ - - q { - quotes: none; - } - - /* - * Addresses `quotes` property not supported in Safari 4. - */ - - q:before, - q:after { - content: ''; - content: none; - } -} - -/** - * Address inconsistent and variable font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -@if $legacy_browser_support { - - /* ========================================================================== - Lists - ========================================================================== */ - - /* - * Addresses margins set differently in IE 6/7. - */ - - dl, - menu, - ol, - ul { - margin: 1em 0; - } - - dd { - margin: 0 0 0 40px; - } - - /* - * Addresses paddings set differently in IE 6/7. - */ - - menu, - ol, - ul { - padding: 0 0 0 40px; - } - - /* - * Corrects list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - list-style: none; - list-style-image: none; - } - -} - -/* ========================================================================== - Embedded content - ========================================================================== */ - -/** - * 1. Remove border when inside `a` element in IE 8/9. - * 2. Improves image quality when scaled in IE 7. - */ - -img { - border: 0; - @if $legacy_browser_support { - -ms-interpolation-mode: bicubic; /* 2 */ - } -} - -/** - * Correct overflow displayed oddly in IE 9. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* ========================================================================== - Figures - ========================================================================== */ - -/** - * Address margin not present in IE 8/9 and Safari 5. - */ - -figure { - margin: 0; -} - -/* ========================================================================== - Forms - ========================================================================== */ - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct `color` not being inherited in IE 8/9. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - * 3. Corrects text not wrapping in Firefox 3. - * 4. Corrects alignment displayed oddly in IE 6/7. - */ - -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ - @if $legacy_browser_support { - white-space: normal; /* 2 */ - *margin-left: -7px; /* 3 */ - } -} - -/** - * 1. Correct font family not being inherited in all browsers. - * 2. Correct font size not being inherited in all browsers. - * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. - * 4. Improves appearance and consistency in all browsers. - */ - -button, -input, -select, -textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 2 */ - margin: 0; /* 3 */ - @if $legacy_browser_support { - vertical-align: baseline; /* 3 */ - *vertical-align: middle; /* 3 */ - } -} - -/** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - -button, -input { - line-height: normal; -} - -/** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. - * Correct `select` style inheritance in Firefox 4+ and Opera. - */ - -button, -select { - text-transform: none; -} - -/** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. - * 4. Removes inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if $legacy_browser_support { - *overflow: visible; /* 4 */ - } -} - -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * 1. Address box sizing set to `content-box` in IE 8/9. - * 2. Remove excess padding in IE 8/9. - * 3. Removes excess padding in IE 7. - * Known issue: excess padding remains in IE 6. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - @if $legacy_browser_support { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/** - * Remove inner padding and search cancel button in Safari 5 and Chrome - * on OS X. - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Remove inner padding and border in Firefox 4+. - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/** - * 1. Remove default vertical scrollbar in IE 8/9. - * 2. Improve readability and alignment in all browsers. - */ - -textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ -} - -/* ========================================================================== - Tables - ========================================================================== */ - -/** - * Remove most spacing between table cells. - */ - -table { - border-collapse: collapse; - border-spacing: 0; -} +/* ========================================================================== + Normalize.scss settings + ========================================================================== */ +/** + * Includes legacy browser support IE6/7 + * + * Set to false if you want to drop support for IE6 and IE7 + */ + +$legacy_browser_support: false; + +/* ========================================================================== + HTML5 display definitions + ========================================================================== */ + +/* + * Corrects `block` display not defined in IE 8/9. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} + +/** + * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. + */ + +audio, +canvas, +video { + display: inline-block; + @if $legacy_browser_support { + *display: inline; + *zoom: 1; + } +} + +/** + * Prevents modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +[hidden] { + display: none; +} + +/* ========================================================================== + Base + ========================================================================== */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + */ + +html { + @if $legacy_browser_support { + font-size: 100%; /* 1 */ + } + font-family: sans-serif; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* ========================================================================== + Links + ========================================================================== */ + +/** + * Address `outline` inconsistency between Chrome and other browsers. + */ + +/** + * Improves readability when focused and also mouse hovered in all browsers. + */ + +a { + &:focus { + outline: thin dotted; + } + &:active, &:hover { + outline: 0; + }; +} + + +/* ========================================================================== + Typography + ========================================================================== */ + +/** + * Addresses font sizes and margins set differently in IE 6/7. + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari 5, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; + @if $legacy_browser_support { + margin: 0.67em 0; + } +} + +@if $legacy_browser_support { + h2 { + font-size: 1.5em; + margin: 0.83em 0; + } + + h3 { + font-size: 1.17em; + margin: 1em 0; + } + + h4 { + font-size: 1em; + margin: 1.33em 0; + } + + h5 { + font-size: 0.83em; + margin: 1.67em 0; + } + + h6 { + font-size: 0.75em; + margin: 2.33em 0; + } +} + +/** + * Address styling not present in IE 8/9, Safari 5, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +@if $legacy_browser_support { + blockquote { + margin: 1em 40px; + } +} + +/** + * Address styling not present in Safari 5 and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Addresses styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Addresses margins set differently in IE 6/7. + */ + +@if $legacy_browser_support { + p, + pre { + margin: 1em 0; + } +} + +/** + * Correct font family set oddly in Safari 5 and Chrome. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, serif; + @if $legacy_browser_support { + _font-family: 'courier new', monospace; + } + font-size: 1em; +} + +/** + * Improve readability of pre-formatted text in all browsers. + */ + +pre { + white-space: pre-wrap; +} + +/** + * Set consistent quote types. + */ + +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} + +@if $legacy_browser_support { + /* + * Addresses CSS quotes not supported in IE 6/7. + */ + + q { + quotes: none; + } + + /* + * Addresses `quotes` property not supported in Safari 4. + */ + + q:before, + q:after { + content: ''; + content: none; + } +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +@if $legacy_browser_support { + + /* ========================================================================== + Lists + ========================================================================== */ + + /* + * Addresses margins set differently in IE 6/7. + */ + + dl, + menu, + ol, + ul { + margin: 1em 0; + } + + dd { + margin: 0 0 0 40px; + } + + /* + * Addresses paddings set differently in IE 6/7. + */ + + menu, + ol, + ul { + padding: 0 0 0 40px; + } + + /* + * Corrects list images handled incorrectly in IE 7. + */ + + nav ul, + nav ol { + list-style: none; + list-style-image: none; + } + +} + +/* ========================================================================== + Embedded content + ========================================================================== */ + +/** + * 1. Remove border when inside `a` element in IE 8/9. + * 2. Improves image quality when scaled in IE 7. + */ + +img { + border: 0; + @if $legacy_browser_support { + -ms-interpolation-mode: bicubic; /* 2 */ + } +} + +/** + * Correct overflow displayed oddly in IE 9. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* ========================================================================== + Figures + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari 5. + */ + +figure { + margin: 0; +} + +/* ========================================================================== + Forms + ========================================================================== */ + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 3. Corrects text not wrapping in Firefox 3. + * 4. Corrects alignment displayed oddly in IE 6/7. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + white-space: normal; /* 2 */ + *margin-left: -7px; /* 3 */ + } +} + +/** + * 1. Correct font family not being inherited in all browsers. + * 2. Correct font size not being inherited in all browsers. + * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. + * 4. Improves appearance and consistency in all browsers. + */ + +button, +input, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ + @if $legacy_browser_support { + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ + } +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +button, +input { + line-height: normal; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + * 4. Removes inner spacing in IE 7 without affecting normal text inputs. + * Known issue: inner spacing remains in IE 6. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ + @if $legacy_browser_support { + *overflow: visible; /* 4 */ + } +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * 1. Address box sizing set to `content-box` in IE 8/9. + * 2. Remove excess padding in IE 8/9. + * 3. Removes excess padding in IE 7. + * Known issue: excess padding remains in IE 6. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ + } +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari 5 and Chrome + * on OS X. + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * 1. Remove default vertical scrollbar in IE 8/9. + * 2. Improve readability and alignment in all browsers. + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + +/* ========================================================================== + Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} From 7ba30a7dfc68aef77186d2aceb9b68b03ee17c29 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 5 Feb 2013 09:56:50 +0800 Subject: [PATCH 06/25] rename file Signed-off-by: Bo-Yi Wu --- normalize.scss => _normalize.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename normalize.scss => _normalize.scss (100%) diff --git a/normalize.scss b/_normalize.scss similarity index 100% rename from normalize.scss rename to _normalize.scss From 0c52482a8ad098ff9f576466bde820d633556e51 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 5 Feb 2013 10:00:13 +0800 Subject: [PATCH 07/25] update component.json Signed-off-by: Bo-Yi Wu --- component.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/component.json b/component.json index 006d0dc95..8781a9b09 100644 --- a/component.json +++ b/component.json @@ -1,12 +1,13 @@ { - "name": "normalize-css", + "name": "normalize.scss", "version": "2.1.0", - "author": "Nicolas Gallagher", - "homepage": "http://necolas.github.com/normalize.css/", - "styles": ["normalize.css"], + "author": ["Nicolas Gallagher", "Bo-Yi Wu"], + "homepage": "https://github.com/appleboy/normalize.scss", + "styles": ["_normalize.scss"], + "main": ["_normalize.scss"], "repository": { "type": "git", - "url": "https://github.com/necolas/normalize.css.git" + "url": "https://github.com/appleboy/normalize.scss.git" }, "licenses": [{ "type": "MIT", From d1b117e306867ebe6f8a68356e05371409a1fb26 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 30 Apr 2013 20:26:09 +0800 Subject: [PATCH 08/25] update to 2.1.1 for bower package. Signed-off-by: Bo-Yi Wu --- _normalize.scss | 18 ++++++++++++------ component.json | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/_normalize.scss b/_normalize.scss index fa9ce273c..8dc6ab71a 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -69,10 +69,14 @@ audio:not([controls]) { ========================================================================== */ /** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling + * 1. Prevent system color scheme's background color being used in Firefox, IE, + * and Opera. + * 2. Prevent system color scheme's text color being used in Firefox, IE, and + * Opera. + * 3. Set default font family to sans-serif. + * 4. Prevent iOS text size adjust after orientation change, without disabling * user zoom. - * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * 5.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. */ @@ -80,9 +84,11 @@ html { @if $legacy_browser_support { font-size: 100%; /* 1 */ } - font-family: sans-serif; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ + background: #fff; /* 1 */ + color: #000; /* 2 */ + font-family: sans-serif; /* 3 */ + -ms-text-size-adjust: 100%; /* 4 */ + -webkit-text-size-adjust: 100%; /* 4 */ } /** diff --git a/component.json b/component.json index 8781a9b09..c04a627c0 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "normalize.scss", - "version": "2.1.0", + "version": "2.1.1", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "homepage": "https://github.com/appleboy/normalize.scss", "styles": ["_normalize.scss"], From e97f51baeb907b02870f61b23da393a5d33d6ee8 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 25 May 2013 22:17:45 +0800 Subject: [PATCH 09/25] add bower JSON file. Signed-off-by: Bo-Yi Wu --- bower.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 000000000..c04a627c0 --- /dev/null +++ b/bower.json @@ -0,0 +1,16 @@ +{ + "name": "normalize.scss", + "version": "2.1.1", + "author": ["Nicolas Gallagher", "Bo-Yi Wu"], + "homepage": "https://github.com/appleboy/normalize.scss", + "styles": ["_normalize.scss"], + "main": ["_normalize.scss"], + "repository": { + "type": "git", + "url": "https://github.com/appleboy/normalize.scss.git" + }, + "licenses": [{ + "type": "MIT", + "url": "http://opensource.org/licenses/MIT" + }] +} From 1933b6a7836831a3b71e3cd5a7acefaf741eba72 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 25 May 2013 23:11:58 +0800 Subject: [PATCH 10/25] update to 2.1.2 Signed-off-by: Bo-Yi Wu --- _normalize.scss | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/_normalize.scss b/_normalize.scss index 8dc6ab71a..971fc7662 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -69,26 +69,19 @@ audio:not([controls]) { ========================================================================== */ /** - * 1. Prevent system color scheme's background color being used in Firefox, IE, - * and Opera. - * 2. Prevent system color scheme's text color being used in Firefox, IE, and - * Opera. - * 3. Set default font family to sans-serif. - * 4. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - * 5.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. */ html { @if $legacy_browser_support { - font-size: 100%; /* 1 */ + font-size: 100%; /* 3 */ } - background: #fff; /* 1 */ - color: #000; /* 2 */ - font-family: sans-serif; /* 3 */ - -ms-text-size-adjust: 100%; /* 4 */ - -webkit-text-size-adjust: 100%; /* 4 */ + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } /** From af6081c76ce95308ca28122bf0577b46622f80a7 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 25 May 2013 23:15:09 +0800 Subject: [PATCH 11/25] update to 2.1.2 Signed-off-by: Bo-Yi Wu --- component.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component.json b/component.json index 7ee970e2c..71820d7ee 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "normalize.scss", - "version": "2.1.1", + "version": "2.1.2", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "styles": ["_normalize.scss"] } From 00b61b1d78973228912e456605c0c381655855fb Mon Sep 17 00:00:00 2001 From: Hans Christian Reinl Date: Sun, 30 Jun 2013 15:04:07 +0200 Subject: [PATCH 12/25] Change component name to normalize-scss --- bower.json | 2 +- component.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 9ffa47c94..b73d8b9bf 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "normalize.scss", + "name": "normalize-scss", "version": "2.1.2", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "main": ["_normalize.scss"], diff --git a/component.json b/component.json index 71820d7ee..3a8ecdadb 100644 --- a/component.json +++ b/component.json @@ -1,5 +1,5 @@ { - "name": "normalize.scss", + "name": "normalize-scss", "version": "2.1.2", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "styles": ["_normalize.scss"] From 45920776e4da2e480270402f3c49c1391a849f84 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 3 Dec 2013 19:51:20 +0800 Subject: [PATCH 13/25] update scss to 2.1.3 version. Signed-off-by: Bo-Yi Wu --- _normalize.scss | 19 ++++++++++++++----- bower.json | 2 +- component.json | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/_normalize.scss b/_normalize.scss index 971fc7662..163a5939e 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -57,10 +57,11 @@ audio:not([controls]) { } /** - * Address styling not present in IE 8/9. + * Address `[hidden]` styling not present in IE 8/9. + * Hide the `template` element in IE, Safari, and Firefox < 22. */ -[hidden] { +[hidden], template { display: none; } @@ -96,6 +97,15 @@ body { Links ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background: transparent; +} + + /** * Address `outline` inconsistency between Chrome and other browsers. */ @@ -481,9 +491,8 @@ html input[disabled] { } /** - * 1. Address box sizing set to `content-box` in IE 8/9. - * 2. Remove excess padding in IE 8/9. - * 3. Removes excess padding in IE 7. + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 7/8/9/10. * Known issue: excess padding remains in IE 6. */ diff --git a/bower.json b/bower.json index b73d8b9bf..76b9eccfa 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "2.1.2", + "version": "2.1.3", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "main": ["_normalize.scss"], "ignore": [ diff --git a/component.json b/component.json index 3a8ecdadb..3cae4f380 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "2.1.2", + "version": "2.1.3", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "styles": ["_normalize.scss"] } From f7829edb3358c765a268bd04610548806e605044 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 3 Dec 2013 20:00:28 +0800 Subject: [PATCH 14/25] update readme. Signed-off-by: Bo-Yi Wu --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 273482726..653e673c9 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ normalizing. [Check out the demo](http://necolas.github.io/normalize.css/latest/test.html) +## Install with Bower + +Install with [Bower](http://bower.io/): `bower install --save normalize-scss` + ## Install Download from the [project page](http://necolas.github.io/normalize.css/). From d52eebbe7c2f72c50fdf3b33b9a3d8dce785ec3a Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Fri, 17 Jan 2014 17:47:21 +0100 Subject: [PATCH 15/25] adds default flag, so users can set it from outside the file --- _normalize.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_normalize.scss b/_normalize.scss index 163a5939e..9dc598a3e 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -7,7 +7,7 @@ * Set to false if you want to drop support for IE6 and IE7 */ -$legacy_browser_support: false; +$legacy_browser_support: false !default; /* ========================================================================== HTML5 display definitions From 26afcb3ce22dc17e4b18a4d1b52eeb6f94a614cf Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 25 Feb 2014 12:07:43 +0800 Subject: [PATCH 16/25] udpate to v3.0.0 Signed-off-by: Bo-Yi Wu --- _normalize.scss | 390 +++++++++++++++++++++++++----------------------- 1 file changed, 203 insertions(+), 187 deletions(-) diff --git a/_normalize.scss b/_normalize.scss index 9dc598a3e..9292d08d3 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -9,12 +9,41 @@ $legacy_browser_support: false !default; -/* ========================================================================== - HTML5 display definitions +/* Base ========================================================================== */ -/* - * Corrects `block` display not defined in IE 8/9. +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ + @if $legacy_browser_support { + *font-size: 100%; /* 3 */ + } +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. + * Correct `block` display not defined for `main` in IE 11. */ article, @@ -33,13 +62,16 @@ summary { } /** - * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. + * 1. Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ audio, canvas, +progress, video { - display: inline-block; + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ @if $legacy_browser_support { *display: inline; *zoom: 1; @@ -57,79 +89,71 @@ audio:not([controls]) { } /** - * Address `[hidden]` styling not present in IE 8/9. - * Hide the `template` element in IE, Safari, and Firefox < 22. + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { +[hidden], +template { display: none; } -/* ========================================================================== - Base +/* Links ========================================================================== */ /** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * 3.Corrects text resizing oddly in IE 6/7 when body `font-size` is set using - * `em` units. + * Remove the gray background color from active links in IE 10. */ -html { - @if $legacy_browser_support { - font-size: 100%; /* 3 */ - } - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ +a { + background: transparent; } /** - * Remove default margin. + * Improve readability when focused and also mouse hovered in all browsers. */ -body { - margin: 0; +a { + &:active, &:hover { + outline: 0; + }; } -/* ========================================================================== - Links +/* Text-level semantics ========================================================================== */ /** - * Remove the gray background color from active links in IE 10. + * Address styling not present in IE 8/9, Safari 5, and Chrome. */ -a { - background: transparent; +abbr[title] { + border-bottom: 1px dotted; } - /** - * Address `outline` inconsistency between Chrome and other browsers. + * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. */ -/** - * Improves readability when focused and also mouse hovered in all browsers. - */ +b, +strong { + font-weight: bold; +} -a { - &:focus { - outline: thin dotted; +@if $legacy_browser_support { + blockquote { + margin: 1em 40px; } - &:active, &:hover { - outline: 0; - }; } +/** + * Address styling not present in Safari 5 and Chrome. + */ -/* ========================================================================== - Typography - ========================================================================== */ +dfn { + font-style: italic; +} /** - * Addresses font sizes and margins set differently in IE 6/7. * Address variable `h1` font-size and margin within `section` and `article` * contexts in Firefox 4+, Safari 5, and Chrome. */ @@ -137,9 +161,6 @@ a { h1 { font-size: 2em; margin: 0.67em 0; - @if $legacy_browser_support { - margin: 0.67em 0; - } } @if $legacy_browser_support { @@ -164,52 +185,11 @@ h1 { } h6 { - font-size: 0.75em; + font-size: 0.67em; margin: 2.33em 0; } } -/** - * Address styling not present in IE 8/9, Safari 5, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -@if $legacy_browser_support { - blockquote { - margin: 1em 40px; - } -} - -/** - * Address styling not present in Safari 5 and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; -} - /** * Addresses styling not present in IE 8/9. */ @@ -219,55 +199,23 @@ mark { color: #000; } -/** - * Addresses margins set differently in IE 6/7. - */ - @if $legacy_browser_support { - p, - pre { - margin: 1em 0; - } -} -/** - * Correct font family set oddly in Safari 5 and Chrome. - */ + /** + * Addresses margins set differently in IE 6/7. + */ -code, -kbd, -pre, -samp { - font-family: monospace, serif; - @if $legacy_browser_support { - _font-family: 'courier new', monospace; + p, + pre { + *margin: 1em 0; } - font-size: 1em; -} - -/** - * Improve readability of pre-formatted text in all browsers. - */ -pre { - white-space: pre-wrap; -} - -/** - * Set consistent quote types. - */ - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - -@if $legacy_browser_support { /* * Addresses CSS quotes not supported in IE 6/7. */ q { - quotes: none; + *quotes: none; } /* @@ -323,11 +271,11 @@ sub { menu, ol, ul { - margin: 1em 0; + *margin: 1em 0; } dd { - margin: 0 0 0 40px; + *margin: 0 0 0 40px; } /* @@ -337,7 +285,7 @@ sub { menu, ol, ul { - padding: 0 0 0 40px; + *padding: 0 0 0 40px; } /* @@ -346,25 +294,24 @@ sub { nav ul, nav ol { - list-style: none; - list-style-image: none; + *list-style: none; + *list-style-image: none; } } -/* ========================================================================== - Embedded content +/* Embedded content ========================================================================== */ /** - * 1. Remove border when inside `a` element in IE 8/9. + * 1. Remove border when inside `a` element in IE 8/9/10. * 2. Improves image quality when scaled in IE 7. */ img { border: 0; @if $legacy_browser_support { - -ms-interpolation-mode: bicubic; /* 2 */ + *-ms-interpolation-mode: bicubic; /* 2 */ } } @@ -376,8 +323,7 @@ svg:not(:root) { overflow: hidden; } -/* ========================================================================== - Figures +/* Grouping content ========================================================================== */ /** @@ -385,52 +331,66 @@ svg:not(:root) { */ figure { - margin: 0; + margin: 1em 40px; } -/* ========================================================================== - Forms - ========================================================================== */ +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} /** - * Define consistent border, margin, and padding. + * Contain overflow in all browsers. */ -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +pre { + overflow: auto; } /** - * 1. Correct `color` not being inherited in IE 8/9. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - * 3. Corrects text not wrapping in Firefox 3. - * 4. Corrects alignment displayed oddly in IE 6/7. + * Address odd `em`-unit font size rendering in all browsers. + * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. */ -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ +code, +kbd, +pre, +samp { + font-family: monospace, monospace; @if $legacy_browser_support { - white-space: normal; /* 2 */ - *margin-left: -7px; /* 3 */ + _font-family: 'courier new', monospace; } + font-size: 1em; } +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + /** - * 1. Correct font family not being inherited in all browsers. - * 2. Correct font size not being inherited in all browsers. - * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. * 4. Improves appearance and consistency in all browsers. */ button, input, +optgroup, select, textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 2 */ + color: inherit; /* 1 */ + font: inherit; /* 2 */ margin: 0; /* 3 */ @if $legacy_browser_support { vertical-align: baseline; /* 3 */ @@ -439,20 +399,18 @@ textarea { } /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. + * Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button, -input { - line-height: normal; +button { + overflow: visible; } /** * Address inconsistent `text-transform` inheritance for `button` and `select`. * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. - * Correct `select` style inheritance in Firefox 4+ and Opera. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. */ button, @@ -490,9 +448,28 @@ html input[disabled] { cursor: default; } +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + /** * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 7/8/9/10. + * 2. Remove excess padding in IE 8/9/10. * Known issue: excess padding remains in IE 6. */ @@ -507,8 +484,19 @@ input[type="radio"] { } /** - * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome * (include `-moz` to future-proof). */ @@ -520,37 +508,60 @@ input[type="search"] { } /** - * Remove inner padding and search cancel button in Safari 5 and Chrome - * on OS X. + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). */ input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; + -webkit-appearance: none; } /** - * Remove inner padding and border in Firefox 4+. + * Define consistent border, margin, and padding. */ -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } /** - * 1. Remove default vertical scrollbar in IE 8/9. - * 2. Improve readability and alignment in all browsers. + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 3. Corrects text not wrapping in Firefox 3. + * 4. Corrects alignment displayed oddly in IE 6/7. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + white-space: normal; /* 3 */ + *margin-left: -7px; /* 4 */ + } +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. */ textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ + overflow: auto; } -/* ========================================================================== - Tables +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables ========================================================================== */ /** @@ -561,3 +572,8 @@ table { border-collapse: collapse; border-spacing: 0; } + +td, +th { + padding: 0; +} \ No newline at end of file From 2c133eb3bf393b0312d3fee2a5c477396f657d7f Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 25 Feb 2014 12:21:38 +0800 Subject: [PATCH 17/25] update 3.0.0 version Signed-off-by: Bo-Yi Wu --- bower.json | 6 +++--- component.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bower.json b/bower.json index 473f60fc6..90bf3678b 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,8 @@ { - "name": "normalize-css", + "name": "normalize-scss", "version": "3.0.0", - "main": "normalize.css", - "author": "Nicolas Gallagher", + "main": "_normalize.scss", + "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "ignore": [ "CHANGELOG.md", "CONTRIBUTING.md", diff --git a/component.json b/component.json index 0a9b8b646..ad0956ea8 100644 --- a/component.json +++ b/component.json @@ -1,8 +1,8 @@ { - "name": "normalize.css", - "repo": "necolas/normalize.css", + "name": "normalize-scss", + "repo": "appleboy/normalize.scss", "version": "3.0.0", - "styles": ["normalize.css"], - "author": "Nicolas Gallagher", + "styles": ["_normalize.scss"], + "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "license": "MIT" } From 6331791eb2cbd8f1f7f2b5f8796ef1f2426c7aef Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 29 Mar 2014 11:51:44 +0800 Subject: [PATCH 18/25] update to 3.0.1 and convert 4 space to 2 space. Signed-off-by: Bo-Yi Wu --- _normalize.scss | 354 ++++++++++++++++++++++++------------------------ normalize.css | 4 +- package.json | 2 +- 3 files changed, 180 insertions(+), 180 deletions(-) diff --git a/_normalize.scss b/_normalize.scss index 9292d08d3..23daf71ee 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -15,18 +15,18 @@ $legacy_browser_support: false !default; /** * 1. Set default font family to sans-serif. * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. + * user zoom. * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using - * `em` units. + * `em` units. */ html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ - @if $legacy_browser_support { - *font-size: 100%; /* 3 */ - } + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ + @if $legacy_browser_support { + *font-size: 100%; /* 3 */ + } } /** @@ -34,7 +34,7 @@ html { */ body { - margin: 0; + margin: 0; } /* HTML5 display definitions @@ -58,7 +58,7 @@ main, nav, section, summary { - display: block; + display: block; } /** @@ -70,12 +70,12 @@ audio, canvas, progress, video { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ - @if $legacy_browser_support { - *display: inline; - *zoom: 1; - } + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ + @if $legacy_browser_support { + *display: inline; + *zoom: 1; + } } /** @@ -84,8 +84,8 @@ video { */ audio:not([controls]) { - display: none; - height: 0; + display: none; + height: 0; } /** @@ -95,7 +95,7 @@ audio:not([controls]) { [hidden], template { - display: none; + display: none; } /* Links @@ -106,7 +106,7 @@ template { */ a { - background: transparent; + background: transparent; } /** @@ -114,80 +114,80 @@ a { */ a { - &:active, &:hover { - outline: 0; - }; + &:active, &:hover { + outline: 0; + }; } /* Text-level semantics ========================================================================== */ /** - * Address styling not present in IE 8/9, Safari 5, and Chrome. + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ abbr[title] { - border-bottom: 1px dotted; + border-bottom: 1px dotted; } /** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ b, strong { - font-weight: bold; + font-weight: bold; } @if $legacy_browser_support { - blockquote { - margin: 1em 40px; - } + blockquote { + margin: 1em 40px; + } } /** - * Address styling not present in Safari 5 and Chrome. + * Address styling not present in Safari and Chrome. */ dfn { - font-style: italic; + font-style: italic; } /** * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari 5, and Chrome. + * contexts in Firefox 4+, Safari, and Chrome. */ h1 { - font-size: 2em; - margin: 0.67em 0; + font-size: 2em; + margin: 0.67em 0; } @if $legacy_browser_support { - h2 { - font-size: 1.5em; - margin: 0.83em 0; - } + h2 { + font-size: 1.5em; + margin: 0.83em 0; + } - h3 { - font-size: 1.17em; - margin: 1em 0; - } + h3 { + font-size: 1.17em; + margin: 1em 0; + } - h4 { - font-size: 1em; - margin: 1.33em 0; - } + h4 { + font-size: 1em; + margin: 1.33em 0; + } - h5 { - font-size: 0.83em; - margin: 1.67em 0; - } + h5 { + font-size: 0.83em; + margin: 1.67em 0; + } - h6 { - font-size: 0.67em; - margin: 2.33em 0; - } + h6 { + font-size: 0.67em; + margin: 2.33em 0; + } } /** @@ -195,38 +195,38 @@ h1 { */ mark { - background: #ff0; - color: #000; + background: #ff0; + color: #000; } @if $legacy_browser_support { - /** - * Addresses margins set differently in IE 6/7. - */ + /** + * Addresses margins set differently in IE 6/7. + */ - p, - pre { - *margin: 1em 0; - } + p, + pre { + *margin: 1em 0; + } - /* - * Addresses CSS quotes not supported in IE 6/7. - */ + /* + * Addresses CSS quotes not supported in IE 6/7. + */ - q { - *quotes: none; - } + q { + *quotes: none; + } - /* - * Addresses `quotes` property not supported in Safari 4. - */ + /* + * Addresses `quotes` property not supported in Safari 4. + */ - q:before, - q:after { - content: ''; - content: none; - } + q:before, + q:after { + content: ''; + content: none; + } } /** @@ -234,7 +234,7 @@ mark { */ small { - font-size: 80%; + font-size: 80%; } /** @@ -243,60 +243,60 @@ small { sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sup { - top: -0.5em; + top: -0.5em; } sub { - bottom: -0.25em; + bottom: -0.25em; } @if $legacy_browser_support { - /* ========================================================================== - Lists - ========================================================================== */ + /* ========================================================================== + Lists + ========================================================================== */ - /* - * Addresses margins set differently in IE 6/7. - */ + /* + * Addresses margins set differently in IE 6/7. + */ - dl, - menu, - ol, - ul { - *margin: 1em 0; - } + dl, + menu, + ol, + ul { + *margin: 1em 0; + } - dd { - *margin: 0 0 0 40px; - } + dd { + *margin: 0 0 0 40px; + } - /* - * Addresses paddings set differently in IE 6/7. - */ + /* + * Addresses paddings set differently in IE 6/7. + */ - menu, - ol, - ul { - *padding: 0 0 0 40px; - } + menu, + ol, + ul { + *padding: 0 0 0 40px; + } - /* - * Corrects list images handled incorrectly in IE 7. - */ + /* + * Corrects list images handled incorrectly in IE 7. + */ - nav ul, - nav ol { - *list-style: none; - *list-style-image: none; - } + nav ul, + nav ol { + *list-style: none; + *list-style-image: none; + } } @@ -309,29 +309,29 @@ sub { */ img { - border: 0; - @if $legacy_browser_support { - *-ms-interpolation-mode: bicubic; /* 2 */ - } + border: 0; + @if $legacy_browser_support { + *-ms-interpolation-mode: bicubic; /* 2 */ + } } /** - * Correct overflow displayed oddly in IE 9. + * Correct overflow not hidden in IE 9/10/11. */ svg:not(:root) { - overflow: hidden; + overflow: hidden; } /* Grouping content ========================================================================== */ /** - * Address margin not present in IE 8/9 and Safari 5. + * Address margin not present in IE 8/9 and Safari. */ figure { - margin: 1em 40px; + margin: 1em 40px; } /** @@ -339,9 +339,9 @@ figure { */ hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; } /** @@ -349,7 +349,7 @@ hr { */ pre { - overflow: auto; + overflow: auto; } /** @@ -361,11 +361,11 @@ code, kbd, pre, samp { - font-family: monospace, monospace; - @if $legacy_browser_support { - _font-family: 'courier new', monospace; - } - font-size: 1em; + font-family: monospace, monospace; + @if $legacy_browser_support { + _font-family: 'courier new', monospace; + } + font-size: 1em; } /* Forms @@ -378,7 +378,7 @@ samp { /** * 1. Correct color not being inherited. - * Known issue: affects color of disabled elements. + * Known issue: affects color of disabled elements. * 2. Correct font properties not being inherited. * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. * 4. Improves appearance and consistency in all browsers. @@ -389,13 +389,13 @@ input, optgroup, select, textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if $legacy_browser_support { - vertical-align: baseline; /* 3 */ - *vertical-align: middle; /* 3 */ - } + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ + @if $legacy_browser_support { + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ + } } /** @@ -415,28 +415,28 @@ button { button, select { - text-transform: none; + text-transform: none; } /** * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. + * and `video` controls. * 2. Correct inability to style clickable `input` types in iOS. * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. + * `input` and others. * 4. Removes inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. + * Known issue: inner spacing remains in IE 6. */ button, html input[type="button"], /* 1 */ input[type="reset"], input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if $legacy_browser_support { - *overflow: visible; /* 4 */ - } + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ + @if $legacy_browser_support { + *overflow: visible; /* 4 */ + } } /** @@ -445,7 +445,7 @@ input[type="submit"] { button[disabled], html input[disabled] { - cursor: default; + cursor: default; } /** @@ -470,17 +470,17 @@ input { /** * 1. Address box sizing set to `content-box` in IE 8/9/10. * 2. Remove excess padding in IE 8/9/10. - * Known issue: excess padding remains in IE 6. + * Known issue: excess padding remains in IE 6. */ input[type="checkbox"], input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - @if $legacy_browser_support { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ + } } /** @@ -497,14 +497,14 @@ 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 - * (include `-moz` to future-proof). + * (include `-moz` to future-proof). */ input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; } /** @@ -523,9 +523,9 @@ input[type="search"]::-webkit-search-decoration { */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } /** @@ -536,12 +536,12 @@ fieldset { */ legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ - @if $legacy_browser_support { - white-space: normal; /* 3 */ - *margin-left: -7px; /* 4 */ - } + border: 0; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + white-space: normal; /* 3 */ + *margin-left: -7px; /* 4 */ + } } /** @@ -549,7 +549,7 @@ legend { */ textarea { - overflow: auto; + overflow: auto; } /** @@ -558,7 +558,7 @@ textarea { */ optgroup { - font-weight: bold; + font-weight: bold; } /* Tables @@ -569,11 +569,11 @@ optgroup { */ table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } td, th { - padding: 0; + padding: 0; } \ No newline at end of file diff --git a/normalize.css b/normalize.css index 74b4c79e3..ae8bc83d7 100644 --- a/normalize.css +++ b/normalize.css @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ /** * 1. Set default font family to sans-serif. @@ -422,4 +422,4 @@ table { td, th { padding: 0; -} +} \ No newline at end of file diff --git a/package.json b/package.json index a7e14e240..19afaa3ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "normalize.css", - "version": "3.0.0", + "version": "3.0.1", "description": "Normalize.css as a node packaged module", "style": "normalize.css", "files": [ From 7af9611f2cefaaf00f435bc492abd0cfe816ac5d Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Wed, 26 Mar 2014 21:46:07 -0700 Subject: [PATCH 19/25] Fix indentation --- test.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test.html b/test.html index 002b07b15..03d2bf690 100644 --- a/test.html +++ b/test.html @@ -389,7 +389,7 @@

should not inherit line-height

input[type="checkbox"], input[type="radio"]

should have a border-box box model

- + #radio-box-model { width: 200px; border: 1px solid red; @@ -471,7 +471,7 @@

should not have spaces between cells

Album Year Price - + From d602c9ad29e024fceb1f91fde9abb845f8e41f05 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Wed, 26 Mar 2014 21:49:40 -0700 Subject: [PATCH 20/25] 3.0.1 --- CHANGELOG.md | 2 ++ bower.json | 2 +- component.json | 2 +- normalize.css | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff479842d..5c358bec2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ === HEAD +=== 3.0.1 (March 27, 2014) + * Add package.json for npm support. === 3.0.0 (January 28, 2014) diff --git a/bower.json b/bower.json index 90bf3678b..6616a9662 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "3.0.0", + "version": "3.0.1", "main": "_normalize.scss", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "ignore": [ diff --git a/component.json b/component.json index ad0956ea8..390bef69e 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "normalize-scss", "repo": "appleboy/normalize.scss", - "version": "3.0.0", + "version": "3.0.1", "styles": ["_normalize.scss"], "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "license": "MIT" diff --git a/normalize.css b/normalize.css index ae8bc83d7..08f895079 100644 --- a/normalize.css +++ b/normalize.css @@ -422,4 +422,4 @@ table { td, th { padding: 0; -} \ No newline at end of file +} From 0c531bf47e81d3c45f0eef258f29456b9ccb1f1d Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 15 Nov 2014 00:17:07 +0800 Subject: [PATCH 21/25] update to 3.0.2 Signed-off-by: Bo-Yi Wu --- CHANGELOG.md | 5 +++++ README.md | 12 ++++-------- _normalize.scss | 6 ++++-- bower.json | 2 +- component.json | 2 +- package.json | 15 +++++++-------- test.html | 9 ++++++++- 7 files changed, 30 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c358bec2..49681b6b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ === HEAD +=== 3.0.2 (October 4, 2014) + +* Only alter `background-color` of links in IE 10. +* Add `menu` element to HTML5 display definitions. + === 3.0.1 (March 27, 2014) * Add package.json for npm support. diff --git a/README.md b/README.md index 14782efbe..3d7b589c6 100644 --- a/README.md +++ b/README.md @@ -9,19 +9,15 @@ normalizing. [View the test file](http://necolas.github.io/normalize.css/latest/test.html) -## Install with Bower - -Install with [Bower](http://bower.io/): `bower install --save normalize-scss` - ## Install -Download from the [project page](http://necolas.github.io/normalize.css/). +Download from the [project page](https://github.com/appleboy/normalize.scss). -Install with [Component(1)](https://github.com/component/component/): `component install necolas/normalize.css` +Install with [Component(1)](https://github.com/component/component/): `component install appleboy/normalize.scss` -Install with [npm](http://npmjs.org/): `npm install --save normalize.css` +Install with [npm](http://npmjs.org/): `npm install --save normalize-scss` -Install with [Bower](http://bower.io/): `bower install --save normalize.css` +Install with [Bower](http://bower.io/): `bower install --save normalize-scss` ## What does it do? diff --git a/_normalize.scss b/_normalize.scss index 23daf71ee..31422e8d0 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -42,7 +42,8 @@ body { /** * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. * Correct `block` display not defined for `main` in IE 11. */ @@ -55,6 +56,7 @@ footer, header, hgroup, main, +menu, nav, section, summary { @@ -106,7 +108,7 @@ template { */ a { - background: transparent; + background-color: transparent; } /** diff --git a/bower.json b/bower.json index 6616a9662..e219c8423 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "3.0.1", + "version": "3.0.2", "main": "_normalize.scss", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "ignore": [ diff --git a/component.json b/component.json index 390bef69e..7a54d2312 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "normalize-scss", "repo": "appleboy/normalize.scss", - "version": "3.0.1", + "version": "3.0.2", "styles": ["_normalize.scss"], "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "license": "MIT" diff --git a/package.json b/package.json index 19afaa3ca..942ab4fcc 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,16 @@ { - "name": "normalize.css", - "version": "3.0.1", + "name": "normalize-scss", + "version": "3.0.2", "description": "Normalize.css as a node packaged module", - "style": "normalize.css", + "style": "_normalize.scss", "files": [ - "normalize.css", - "component.json" + "_normalize.scss" ], - "homepage": "http://necolas.github.io/normalize.css", + "homepage": "https://github.com/appleboy/normalize.scss", "repository": { "type": "git", - "url": "git://github.com/necolas/normalize.css.git" + "url": "git://github.com/appleboy/normalize.scss.git" }, - "author": "Nicolas Gallagher", + "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "license": "MIT" } diff --git a/test.html b/test.html index 03d2bf690..e0e96e10d 100644 --- a/test.html +++ b/test.html @@ -97,7 +97,13 @@

should have no margin (opinionated)

(there should be no red background visible on this page)
-

article, aside, details, figure, figcaption, footer, header, hgroup, main, nav, section, summary

+

+ article, aside, details, + figure, figcaption, footer, + header, hgroup, main, + menu, nav, section, + summary +

should render as block

article
@@ -114,6 +120,7 @@

should render as block

header
hgroup
main
+
  • menu
    •
    section
    From 9e1f63a718c00f51ae6307d466750728da1617e8 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 15 Nov 2014 00:28:05 +0800 Subject: [PATCH 22/25] update css to 3.0.2 Signed-off-by: Bo-Yi Wu --- README.md | 2 -- normalize.css | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3d7b589c6..8a1204466 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ Download from the [project page](https://github.com/appleboy/normalize.scss). Install with [Component(1)](https://github.com/component/component/): `component install appleboy/normalize.scss` -Install with [npm](http://npmjs.org/): `npm install --save normalize-scss` - Install with [Bower](http://bower.io/): `bower install --save normalize-scss` ## What does it do? diff --git a/normalize.css b/normalize.css index 08f895079..81c6f31ea 100644 --- a/normalize.css +++ b/normalize.css @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ /** * 1. Set default font family to sans-serif. @@ -25,7 +25,8 @@ body { /** * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. * Correct `block` display not defined for `main` in IE 11. */ @@ -38,6 +39,7 @@ footer, header, hgroup, main, +menu, nav, section, summary { @@ -85,7 +87,7 @@ template { */ a { - background: transparent; + background-color: transparent; } /** @@ -422,4 +424,4 @@ table { td, th { padding: 0; -} +} \ No newline at end of file From 62b8a419be2997bb3183178e25a00135b567a052 Mon Sep 17 00:00:00 2001 From: Hafiz Ismail Date: Wed, 22 Apr 2015 11:34:49 +0800 Subject: [PATCH 23/25] Update to 3.0.3 released on 31 March 2015 --- CHANGELOG.md | 5 +++++ _normalize.scss | 17 +++++++---------- normalize.css | 21 +++++++++------------ 3 files changed, 21 insertions(+), 22 deletions(-) mode change 100644 => 100755 normalize.css diff --git a/CHANGELOG.md b/CHANGELOG.md index 49681b6b6..aaa7a8f6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ === HEAD +=== 3.0.3 (March 30, 2015) + +* Remove unnecessary vendor prefixes. +* Add `main` property. + === 3.0.2 (October 4, 2014) * Only alter `background-color` of links in IE 10. diff --git a/_normalize.scss b/_normalize.scss index 31422e8d0..7c7bed261 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -14,8 +14,8 @@ $legacy_browser_support: false !default; /** * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. */ @@ -92,7 +92,7 @@ audio:not([controls]) { /** * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. */ [hidden], @@ -112,7 +112,8 @@ a { } /** - * Improve readability when focused and also mouse hovered in all browsers. + * Improve readability of focused elements when they are also in an + * active/hover state. */ a { @@ -341,7 +342,6 @@ figure { */ hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -498,15 +498,12 @@ 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 - * (include `-moz` to future-proof). + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. */ input[type="search"] { -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; + box-sizing: content-box; /* 2 */ } /** diff --git a/normalize.css b/normalize.css old mode 100644 new mode 100755 index 81c6f31ea..5e5e3c898 --- a/normalize.css +++ b/normalize.css @@ -1,9 +1,9 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ /** * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. */ html { @@ -71,7 +71,7 @@ audio:not([controls]) { /** * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. */ [hidden], @@ -91,7 +91,8 @@ a { } /** - * Improve readability when focused and also mouse hovered in all browsers. + * Improve readability of focused elements when they are also in an + * active/hover state. */ a:active, @@ -209,7 +210,6 @@ figure { */ hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -350,15 +350,12 @@ 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 - * (include `-moz` to future-proof). + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. */ input[type="search"] { -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; + box-sizing: content-box; /* 2 */ } /** @@ -424,4 +421,4 @@ table { td, th { padding: 0; -} \ No newline at end of file +} From cc00370ff89691a7633873ca6fe55cc09a6e4871 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 22 Apr 2015 11:51:45 +0800 Subject: [PATCH 24/25] update to 3.0.3 Signed-off-by: Bo-Yi Wu --- bower.json | 2 +- component.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index e219c8423..9f47fe713 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "3.0.2", + "version": "3.0.3", "main": "_normalize.scss", "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "ignore": [ diff --git a/component.json b/component.json index 7a54d2312..f45e37ca7 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "normalize-scss", "repo": "appleboy/normalize.scss", - "version": "3.0.2", + "version": "3.0.3", "styles": ["_normalize.scss"], "author": ["Nicolas Gallagher", "Bo-Yi Wu"], "license": "MIT" diff --git a/package.json b/package.json index 942ab4fcc..d2b84792d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "3.0.2", + "version": "3.0.3", "description": "Normalize.css as a node packaged module", "style": "_normalize.scss", "files": [ From d6cf0e7592ba6b0b8749c1c556a2cb590f82abfd Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 9 Jun 2015 09:42:08 +0800 Subject: [PATCH 25/25] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8a1204466..1ffc0eefc 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ Install with [Component(1)](https://github.com/component/component/): `component Install with [Bower](http://bower.io/): `bower install --save normalize-scss` +Install with [Npm](https://www.npmjs.com): `npm install --save node.normalize.scss` + ## What does it do? * Preserves useful defaults, unlike many CSS resets.