diff --git a/CHANGELOG.md b/CHANGELOG.md index c4338e76..a8e0bb0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Master === +* Bundled Normalize.css updated to 2.0.1 3.0.5 ==== diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css index 97768133..73abb76f 100644 --- a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css +++ b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css @@ -1,11 +1,11 @@ -/*! normalize.css 2011-11-04T15:38 UTC - http://github.com/necolas/normalize.css */ +/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ -/* ============================================================================= +/* ========================================================================== HTML5 display definitions ========================================================================== */ /* - * Corrects block display not defined in IE6/7/8/9 & FF3 + * Corrects `block` display not defined in IE 8/9. */ article, @@ -17,86 +17,69 @@ footer, header, hgroup, nav, -section { +section, +summary { display: block; } /* - * Corrects inline-block display not defined in IE6/7/8/9 & FF3 + * Corrects `inline-block` display not defined in IE 8/9. */ audio, canvas, video { display: inline-block; - *display: inline; - *zoom: 1; } /* - * Prevents modern browsers from displaying 'audio' without controls + * 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 IE7/8/9, FF3, S4 - * Known issue: no IE6 support + * Addresses styling for `hidden` attribute not present in IE 8/9. */ [hidden] { display: none; } - -/* ============================================================================= +/* ========================================================================== Base ========================================================================== */ /* - * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units - * http://clagnut.com/blog/348/#c790 - * 2. Keeps page centred in all browsers regardless of content height - * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom - * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ + * 1. Sets default font family to sans-serif. + * 2. Prevents iOS text size adjust after orientation change, without disabling + * user zoom. */ html { - font-size: 100%; /* 1 */ - overflow-y: scroll; /* 2 */ - -webkit-text-size-adjust: 100%; /* 3 */ - -ms-text-size-adjust: 100%; /* 3 */ + font-family: sans-serif; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ } /* - * Addresses margins handled incorrectly in IE6/7 + * Removes default margin. */ body { margin: 0; } -/* - * Addresses font-family inconsistency between 'textarea' and other form elements. - */ - -body, -button, -input, -select, -textarea { - font-family: sans-serif; -} - - -/* ============================================================================= +/* ========================================================================== Links ========================================================================== */ /* - * Addresses outline displayed oddly in Chrome + * Addresses `outline` inconsistency between Chrome and other browsers. */ a:focus { @@ -104,22 +87,21 @@ a:focus { } /* - * Improves readability when focused and also mouse hovered in all browsers - * people.opera.com/patrickl/experiments/keyboard/test + * Improves readability when focused and also mouse hovered in all browsers. */ -a:hover, -a:active { +a:active, +a:hover { outline: 0; } - -/* ============================================================================= +/* ========================================================================== Typography ========================================================================== */ /* - * Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5 + * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, + * Safari 5, and Chrome. */ h1 { @@ -127,7 +109,7 @@ h1 { } /* - * Addresses styling not present in IE7/8/9, S5, Chrome + * Addresses styling not present in IE 8/9, Safari 5, and Chrome. */ abbr[title] { @@ -135,20 +117,16 @@ abbr[title] { } /* - * Addresses style set to 'bolder' in FF3+, S4/5, Chrome -*/ + * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + */ -b, -strong { - font-weight: bold; -} - -blockquote { - margin: 1em 40px; +b, +strong { + font-weight: bold; } /* - * Addresses styling not present in S5, Chrome + * Addresses styling not present in Safari 5 and Chrome. */ dfn { @@ -156,7 +134,7 @@ dfn { } /* - * Addresses styling not present in IE6/7/8/9 + * Addresses styling not present in IE 8/9. */ mark { @@ -164,22 +142,21 @@ mark { color: #000; } + /* - * Corrects font family set oddly in IE6, S4/5, Chrome - * en.wikipedia.org/wiki/User:Davidgothberg/Test59 + * Corrects font family set oddly in Safari 5 and Chrome. */ -pre, code, kbd, +pre, samp { font-family: monospace, serif; - _font-family: 'courier new', monospace; font-size: 1em; } /* - * Improves readability of pre-formatted text in all browsers + * Improves readability of pre-formatted text in all browsers. */ pre { @@ -189,31 +166,23 @@ pre { } /* - * 1. Addresses CSS quotes not supported in IE6/7 - * 2. Addresses quote property not supported in S4 + * Sets consistent quote types. */ -/* 1 */ - q { - quotes: none; -} - -/* 2 */ - -q:before, -q:after { - content: ''; - content: none; -} - -small { - font-size: 75%; + quotes: "\201C" "\201D" "\2018" "\2019"; } /* - * Prevents sub and sup affecting line-height in all browsers - * gist.github.com/413930 + * Addresses inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/* + * Prevents `sub` and `sup` affecting `line-height` in all browsers. */ sub, @@ -232,79 +201,44 @@ sub { bottom: -0.25em; } - -/* ============================================================================= - Lists - ========================================================================== */ - -ul, -ol { - margin-left: 0; - padding: 0 0 0 40px; -} - -dd { - margin: 0 0 0 40px; -} - -nav ul, -nav ol { - list-style: none; - list-style-image: none; -} - - -/* ============================================================================= +/* ========================================================================== Embedded content ========================================================================== */ /* - * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3 - * 2. Improves image quality when scaled in IE7 - * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/ + * Removes border when inside `a` element in IE 8/9. */ img { - border: 0; /* 1 */ - -ms-interpolation-mode: bicubic; /* 2 */ + border: 0; } /* - * Corrects overflow displayed oddly in IE9 + * Corrects overflow displayed oddly in IE 9. */ svg:not(:root) { overflow: hidden; } - -/* ============================================================================= +/* ========================================================================== Figures ========================================================================== */ /* - * Addresses margin not present in IE6/7/8/9, S5, O11 + * Addresses margin not present in IE 8/9 and Safari 5. */ figure { margin: 0; } - -/* ============================================================================= +/* ========================================================================== Forms ========================================================================== */ /* - * Corrects margin displayed oddly in IE6/7 - */ - -form { - margin: 0; -} - -/* - * Define consistent border, margin, and padding + * Define consistent border, margin, and padding. */ fieldset { @@ -314,59 +248,68 @@ fieldset { } /* - * 1. Corrects color not being inherited in IE6/7/8/9 - * 2. Corrects alignment displayed oddly in IE6/7 + * 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 */ - *margin-left: -7px; /* 2 */ + padding: 0; /* 2 */ } /* - * 1. Corrects font size not being inherited in all browsers - * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome - * 3. Improves appearance and consistency in all browsers + * 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-size: 100%; /* 1 */ - margin: 0; /* 2 */ - vertical-align: baseline; /* 3 */ - *vertical-align: middle; /* 3 */ + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ } /* - * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet + * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. */ button, input { - line-height: normal; /* 1 */ + line-height: normal; } /* - * 1. Improves usability and consistency of cursor style between image-type 'input' and others - * 2. Corrects inability to style clickable 'input' types in iOS - * 3. Removes inner spacing in IE7 without affecting normal text inputs - * Known issue: inner spacing remains in IE6 + * 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, -input[type="button"], -input[type="reset"], +html input[type="button"], /* 1 */ +input[type="reset"], input[type="submit"] { - cursor: pointer; /* 1 */ -webkit-appearance: button; /* 2 */ - *overflow: visible; /* 3 */ + cursor: pointer; /* 3 */ } /* - * 1. Addresses box sizing set to content-box in IE8/9 - * 2. Removes excess padding in IE8/9 + * 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"], @@ -376,8 +319,9 @@ input[type="radio"] { } /* - * 1. Addresses appearance set to searchfield in S5, Chrome - * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof) + * 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"] { @@ -388,16 +332,17 @@ input[type="search"] { } /* - * Removes inner padding that is displayed in S5, Chrome on OS X + * 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 FF3+ - * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/ + * Removes inner padding and border in Firefox 4+. */ button::-moz-focus-inner, @@ -407,8 +352,8 @@ input::-moz-focus-inner { } /* - * 1. Removes default vertical scrollbar in IE6/7/8/9 - * 2. Improves readability and alignment in all browsers + * 1. Removes default vertical scrollbar in IE 8/9. + * 2. Improves readability and alignment in all browsers. */ textarea { @@ -416,16 +361,15 @@ textarea { vertical-align: top; /* 2 */ } - -/* ============================================================================= +/* ========================================================================== Tables ========================================================================== */ -/* - * Remove most spacing between table cells +/* + * Remove most spacing between table cells. */ table { border-collapse: collapse; border-spacing: 0; -} +} \ No newline at end of file