From b07fd3c6be15232d4f662666f2c3adf4c0eedb33 Mon Sep 17 00:00:00 2001 From: Mathias Brouilly Date: Thu, 30 Jan 2014 12:30:43 +0100 Subject: [PATCH] upgrade to v3.0.0 and removed required nib --- README.md | 4 - normalize.styl | 256 +++++++++++++++++++++++++++---------------------- 2 files changed, 139 insertions(+), 121 deletions(-) diff --git a/README.md b/README.md index 5ea9507..622d2ed 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,6 @@ ## How to use it - // Nib (required) - // github.com/visionmedia/nib - @import 'nib' - @import 'normalize' Learn more about [Normalize.css](http://nicolasgallagher.com/about-normalize-css/ "Normalize.css") diff --git a/normalize.styl b/normalize.styl index 91b9cdd..b4910c3 100644 --- a/normalize.styl +++ b/normalize.styl @@ -1,7 +1,24 @@ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ -/* ========================================================================== - HTML5 display definitions +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html + font-family: sans-serif // 1 + -ms-text-size-adjust: 100% // 2 + -webkit-text-size-adjust: 100% // 2 + +/** + * Remove default margin. + */ + +body + margin: 0 + +/* HTML5 display definitions ========================================================================== */ /** @@ -23,13 +40,16 @@ summary display: block /** - * Correct `inline-block` display not defined in IE 8/9. + * 1. Correct `inline-block` display not defined in IE 8/9. + * 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 /** * Prevent modern browsers from displaying `audio` without controls. @@ -49,59 +69,23 @@ audio:not([controls]) template display: none -/* ========================================================================== - Base - ========================================================================== */ - -/** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - */ - -html - font-family: sans-serif // 1 - -ms-text-size-adjust: 100% // 2 - -webkit-text-size-adjust: 100% // 2 - -/** - * Remove default margin. - */ - -body - margin: 0 - -/* ========================================================================== - Links +/* Links ========================================================================== */ /** * 1. Remove the gray background color from active links in IE 10. - * 2. Address `outline` inconsistency between Chrome and other browsers. - * 3. Improve readability when focused and also mouse hovered in all browsers. + * 2. Improve readability when focused and also mouse hovered in all browsers. */ a background: transparent // 1 - &:focus - outline: thin dotted // 2 &:active, &:hover - outline: 0 // 3 + outline: 0 // 2 -/* ========================================================================== - Typography +/* Text-level semantics ========================================================================== */ -/** - * 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 - /** * Address styling not present in IE 8/9, Safari 5, and Chrome. */ @@ -125,12 +109,13 @@ dfn font-style: italic /** - * Address differences between Firefox and other browsers. + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari 5, and Chrome. */ -hr - box-sizing: content-box - height: 0 +h1 + font-size: 2em + margin: 0.67em 0 /** * Address styling not present in IE 8/9. @@ -140,31 +125,6 @@ mark background: #ff0 color: #000 -/** - * Correct font family set oddly in Safari 5 and Chrome. - */ - -code, -kbd, -pre, -samp - font-family: monospace, serif - 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" - /** * Address inconsistent and variable font size in all browsers. */ @@ -189,8 +149,7 @@ sup sub bottom: -0.25em -/* ========================================================================== - Embedded content +/* Embedded content ========================================================================== */ /** @@ -207,8 +166,7 @@ img svg:not(:root) overflow: hidden -/* ========================================================================== - Figures +/* Grouping content ========================================================================== */ /** @@ -216,58 +174,71 @@ 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. + * Address odd `em`-unit font size rendering in all browsers. */ -legend - border: 0 // 1 - padding: 0 // 2 +code, +kbd, +pre, +samp + font-family: monospace, 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. + * 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 5, and Chrome. */ button, input, +optgroup, select, textarea - font-family: inherit // 1 - font-size: 100% // 2 + color: inherit // 1 + font: inherit // 2 margin: 0 // 3 /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. + * Address `overflow` set to `hidden` in IE 8/9/10. */ -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+, and Opera + * Correct `select` style inheritance in Firefox. */ button, @@ -298,6 +269,26 @@ 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 + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * * 1. Address box sizing set to `content-box` in IE 8/9/10. * 2. Remove excess padding in IE 8/9/10. */ @@ -307,6 +298,16 @@ input[type="radio"] box-sizing: border-box // 1 padding: 0 // 2 +/** + * 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 5 and Chrome. * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome @@ -315,11 +316,14 @@ input[type="radio"] input[type="search"] -webkit-appearance: textfield // 1 - box-sizing: content-box // 2 + -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. + * 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, @@ -327,25 +331,39 @@ input[type="search"]::-webkit-search-decoration -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. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend + border: 0 // 1 + padding: 0 // 2 + +/** + * Remove default vertical scrollbar in IE 8/9. */ textarea - overflow: auto // 1 - vertical-align: top // 2 + overflow: auto + +/** + * 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. + */ -/* ========================================================================== - Tables +optgroup + font-weight: bold + +/* Tables ========================================================================== */ /** @@ -355,3 +373,7 @@ textarea table border-collapse: collapse border-spacing: 0 + +td, +th + padding: 0