diff --git a/CHANGELOG.md b/CHANGELOG.md index 2147977aa..78828293d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +== 2.1.0PlusLegacy (April 04, 2013) +Merge Normalize 2 and Normalize 1. + remains as in Normalize 2 with quotes + == HEAD * Normalize root `color` and `background` to counter the effects of system @@ -41,3 +45,4 @@ * Remove excess padding from checkbox and radio inputs in IE 7 (#42). * Add IE9 correction for SVG overflow (#16). * Add fix for legend not inheriting color in IE 6/7/8/9. + diff --git a/README.md b/README.md index 6d8c32aae..cf620ddbc 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,15 @@ -# normalize.css v2.1.0 +# normalize.css v2.1.0PlusLegacy + +Normalize2 + legacy browser support. Normalize.css is a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. We researched the differences between default browser styles in order to precisely target only the styles that need normalizing. -[Check out the demo](http://necolas.github.com/normalize.css/2.1.0/test.html) - -[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1) - ## Install -Download from the [project page](http://necolas.github.com/normalize.css/). - -Install with [Bower](http://twitter.github.com/bower/): `bower install --save normalize-css` +Download from the [project page](https://github.com/delka/normalize.css). ## What does it do? @@ -34,15 +30,10 @@ override the defaults later in your CSS. ## Browser support * Google Chrome -* Mozilla Firefox 4+ -* Apple Safari 5+ -* Opera 12+ -* Internet Explorer 8+ - -## Contribute - -Please read my [issue -guidelines](https://github.com/necolas/issue-guidelines). +* Mozilla Firefox 3+ +* Apple Safari 4+ +* Opera 10+ +* Internet Explorer 6+ ## Acknowledgements diff --git a/component.json b/component.json deleted file mode 100644 index a4b271dd5..000000000 --- a/component.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "normalize-css", - "version": "2.1.0", - "author": "Nicolas Gallagher", - "homepage": "http://necolas.github.com/normalize.css/", - "main": "normalize.css", - "styles": ["normalize.css"] -} diff --git a/normalize.css b/normalize.css index dcf0f82ae..9bd2a59dd 100644 --- a/normalize.css +++ b/normalize.css @@ -1,11 +1,11 @@ -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.0PlusLegacy | MIT License | git.io/normalize , http://delka.name/blog/tag/normalize/ */ /* ========================================================================== HTML5 display definitions ========================================================================== */ /** - * Correct `block` display not defined in IE 8/9. + * Correct `block` display not defined in IE 6/7/8/9 and Firefox 3. */ article, @@ -24,13 +24,15 @@ summary { } /** - * Correct `inline-block` display not defined in IE 8/9. + * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. */ audio, canvas, video { display: inline-block; + *display: inline; + *zoom: 1; } /** @@ -44,7 +46,8 @@ audio:not([controls]) { } /** - * Address styling not present in IE 8/9. + * Address styling not present in IE 7/8/9, Firefox 3, and Safari 4. + * Known issue: no IE 6 support. */ [hidden] { @@ -60,17 +63,33 @@ audio:not([controls]) { * 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 + * 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + * 4. Set default font family to sans-serif. + * 5. Prevent iOS text size adjust after orientation change, without disabling * user zoom. */ html { background: #fff; /* 1 */ color: #000; /* 2 */ - font-family: sans-serif; /* 3 */ - -ms-text-size-adjust: 100%; /* 4 */ - -webkit-text-size-adjust: 100%; /* 4 */ + font-size: 100%; /* 3 */ + font-family: sans-serif; /* 4 */ + -webkit-text-size-adjust: 100%; /* 5 */ + -ms-text-size-adjust: 100%; /* 5 */ +} + +/** + * Address `font-family` inconsistency between `textarea` and other form + * elements. + */ + +html, +button, +input, +select, +textarea { + font-family: sans-serif; } /** @@ -107,8 +126,9 @@ a:hover { ========================================================================== */ /** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari 5, and Chrome. + * Address font sizes and margins set differently in IE 6/7. + * Address font sizes within `section` and `article` in Firefox 4+, Safari 5, + * and Chrome. */ h1 { @@ -116,8 +136,33 @@ h1 { margin: 0.67em 0; } +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.67em; + margin: 2.33em 0; +} + /** - * Address styling not present in IE 8/9, Safari 5, and Chrome. + * Address styling not present in IE 7/8/9, Safari 5, and Chrome. */ abbr[title] { @@ -125,7 +170,7 @@ abbr[title] { } /** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + * Address style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. */ b, @@ -133,6 +178,10 @@ strong { font-weight: bold; } +blockquote { + margin: 1em 40px; +} + /** * Address styling not present in Safari 5 and Chrome. */ @@ -143,6 +192,7 @@ dfn { /** * Address differences between Firefox and other browsers. + * Known issue: no IE 6/7 normalization. */ hr { @@ -152,7 +202,7 @@ hr { } /** - * Address styling not present in IE 8/9. + * Address styling not present in IE 6/7/8/9. */ mark { @@ -161,7 +211,16 @@ mark { } /** - * Correct font family set oddly in Safari 5 and Chrome. + * Address margins set differently in IE 6/7. + */ + +p, +pre { + margin: 1em 0; +} + +/** + * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. */ code, @@ -169,6 +228,7 @@ kbd, pre, samp { font-family: monospace, serif; + _font-family: 'courier new', monospace; font-size: 1em; } @@ -177,7 +237,9 @@ samp { */ pre { + white-space: pre; white-space: pre-wrap; + word-wrap: break-word; } /** @@ -216,16 +278,57 @@ sub { bottom: -0.25em; } +/* ========================================================================== + Lists + ========================================================================== */ + +/** + * Address margins set differently in IE 6/7. + */ + +dl, +menu, +ol, +ul { + margin: 1em 0; +} + +dd { + margin: 0 0 0 40px; +} + +/** + * Address paddings set differently in IE 6/7. + */ + +menu, +ol, +ul { + padding: 0 0 0 40px; +} + +/** + * Correct list images handled incorrectly in IE 7. + */ + +nav ul, +nav ol { + list-style: none; + list-style-image: none; +} + /* ========================================================================== Embedded content ========================================================================== */ /** - * Remove border when inside `a` element in IE 8/9. + * 1. Remove border when inside `a` element in IE 6/7/8/9 and Firefox 3. + * 2. Improve image quality when scaled in IE 7. */ img { - border: 0; + border: 0; /* 1 */ + -ms-interpolation-mode: bicubic; /* 2 */ } /** @@ -241,7 +344,7 @@ svg:not(:root) { ========================================================================== */ /** - * Address margin not present in IE 8/9 and Safari 5. + * Address margin not present in IE 6/7/8/9, Safari 5, and Opera 11. */ figure { @@ -252,6 +355,14 @@ figure { Forms ========================================================================== */ +/** + * Correct margin displayed oddly in IE 6/7. + */ + +form { + margin: 0; +} + /** * Define consistent border, margin, and padding. */ @@ -265,17 +376,22 @@ fieldset { /** * 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. Correct text not wrapping in Firefox 3. + * 4. Correct alignment displayed oddly in IE 6/7. */ legend { border: 0; /* 1 */ padding: 0; /* 2 */ + white-space: normal; /* 3 */ + *margin-left: -7px; /* 4 */ } /** * 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. Improve appearance and consistency in all browsers. */ button, @@ -285,10 +401,12 @@ textarea { font-family: inherit; /* 1 */ font-size: 100%; /* 2 */ margin: 0; /* 3 */ + vertical-align: baseline; /* 4 */ + *vertical-align: middle; /* 4 */ } /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * Address Firefox 3+ setting `line-height` on `input` using `!important` in * the UA stylesheet. */ @@ -300,7 +418,7 @@ input { /** * 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 `button` style inheritance in Chrome, Safari 5+, and IE 6+. * Correct `select` style inheritance in Firefox 4+ and Opera. */ @@ -315,6 +433,8 @@ select { * 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. Remove inner spacing in IE 7 without affecting normal text inputs. + * Known issue: inner spacing remains in IE 6. */ button, @@ -323,6 +443,7 @@ input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ + *overflow: visible; /* 4 */ } /** @@ -337,12 +458,16 @@ html input[disabled] { /** * 1. Address box sizing set to `content-box` in IE 8/9. * 2. Remove excess padding in IE 8/9. + * 3. Remove 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 */ + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ } /** @@ -369,7 +494,7 @@ input[type="search"]::-webkit-search-decoration { } /** - * Remove inner padding and border in Firefox 4+. + * Remove inner padding and border in Firefox 3+. */ button::-moz-focus-inner, @@ -379,7 +504,7 @@ input::-moz-focus-inner { } /** - * 1. Remove default vertical scrollbar in IE 8/9. + * 1. Remove default vertical scrollbar in IE 6/7/8/9. * 2. Improve readability and alignment in all browsers. */ @@ -400,3 +525,4 @@ table { border-collapse: collapse; border-spacing: 0; } + diff --git a/normalize.min.css b/normalize.min.css new file mode 100644 index 000000000..bc54a9725 --- /dev/null +++ b/normalize.min.css @@ -0,0 +1,51 @@ +/*! normalize.css v2.1.0PlusLegacy | MIT License | git.io/normalize , http://delka.name/blog/tag/normalize/ */ +article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1} +audio:not([controls]){display:none;height:0} +[hidden]{display:none} +html{background:#fff;color:#000;font-size:100%;font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%} +html,button,input,select,textarea{font-family:sans-serif} +body{margin:0} +a:focus{outline:thin dotted} +a:active,a:hover{outline:0} +h1{font-size:2em;margin:.67em 0} +h2{font-size:1.5em;margin:.83em 0} +h3{font-size:1.17em;margin:1em 0} +h4{font-size:1em;margin:1.33em 0} +h5{font-size:.83em;margin:1.67em 0} +h6{font-size:.67em;margin:2.33em 0} +abbr[title]{border-bottom:1px dotted} +b,strong{font-weight:bold} +blockquote{margin:1em 40px} +dfn{font-style:italic} +hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0} +mark{background:#ff0;color:#000} +p,pre{margin:1em 0} +code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em} +pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word} +q{quotes:"\201C" "\201D" "\2018" "\2019"} +small{font-size:80%} +sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} +sup{top:-0.5em} +sub{bottom:-0.25em} +dl,menu,ol,ul{margin:1em 0} +dd{margin:0 0 0 40px} +menu,ol,ul{padding:0 0 0 40px} +nav ul,nav ol{list-style:none;list-style-image:none} +img{border:0;-ms-interpolation-mode:bicubic} +svg:not(:root){overflow:hidden} +figure{margin:0} +form{margin:0} +fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em} +legend{border:0;padding:0;white-space:normal;*margin-left:-7px} +button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle} +button,input{line-height:normal} +button,select{text-transform:none} +button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible} +button[disabled],html input[disabled]{cursor:default} +input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px} +input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box} +input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none} +button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} +textarea{overflow:auto;vertical-align:top} +table{border-collapse:collapse;border-spacing:0}