stylesheets/_normalize.scss in compass-normalize-0.1.beta.1 vs stylesheets/_normalize.scss in compass-normalize-0.1.beta.2

- old
+ new

@@ -1,7 +1,7 @@ @mixin normalize() { - /*! normalize.css 2011-11-04T15:38 UTC - http://github.com/necolas/normalize.css */ + /*! normalize.css 2012-01-31T16:06 UTC - http://github.com/necolas/normalize.css */ /* ============================================================================= HTML5 display definitions ========================================================================== */ @@ -57,43 +57,41 @@ ========================================================================== */ /* * 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 + * 2. 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/ */ html { font-size: 100%; /* 1 */ - overflow-y: scroll; /* 2 */ - -webkit-text-size-adjust: 100%; /* 3 */ - -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ } - /* - * Addresses margins handled incorrectly in IE6/7 - */ - - body { - margin: 0; - } - /* * Addresses font-family inconsistency between 'textarea' and other form elements. */ - body, + html, button, input, select, textarea { font-family: sans-serif; } + /* + * Addresses margins handled incorrectly in IE6/7 + */ + body { + margin: 0; + } + + /* ============================================================================= Links ========================================================================== */ /* @@ -119,16 +117,43 @@ Typography ========================================================================== */ /* * Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5 + * Fix IE6/7 heading font-size not being relative to the root font-size */ h1 { font-size: 2em; + 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.75em; + margin: 2.33em 0; + } + /* * Addresses styling not present in IE7/8/9, S5, Chrome */ abbr[title] { @@ -314,16 +339,19 @@ padding: 0.35em 0.625em 0.75em; } /* * 1. Corrects color not being inherited in IE6/7/8/9 - * 2. Corrects alignment displayed oddly in IE6/7 + * 2. Corrects text not wrapping in FF3 + * 3. Corrects alignment displayed oddly in IE6/7 */ legend { border: 0; /* 1 */ - *margin-left: -7px; /* 2 */ + padding: 0; + white-space: normal; /* 2 */ + *margin-left: -7px; /* 3 */ } /* * 1. Corrects font size not being inherited in all browsers * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome @@ -364,18 +392,31 @@ -webkit-appearance: button; /* 2 */ *overflow: visible; /* 3 */ } /* + * Re-set default cursor for disabled elements + */ + + button[disabled], + input[disabled] { + cursor: default; + } + + /* * 1. Addresses box sizing set to content-box in IE8/9 * 2. Removes excess padding in IE8/9 + * 3. Removes excess padding in IE7 + Known issue: excess padding remains in IE6 */ input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ } /* * 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) @@ -387,13 +428,14 @@ -webkit-box-sizing: content-box; /* 2 */ box-sizing: content-box; } /* - * Removes inner padding that is displayed in S5, Chrome on OS X + * Removes inner padding and search cancel button in S5, Chrome on OS X */ - input[type="search"]::-webkit-search-decoration { + input[type="search"]::-webkit-search-decoration, + input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } /* * Removes inner padding and border in FF3+ \ No newline at end of file