From 961c0607152061befdca9b8dc98d9238b4cc2972 Mon Sep 17 00:00:00 2001 From: Tilo Mitra Date: Mon, 3 Mar 2014 15:56:55 -0500 Subject: [PATCH 1/2] update Pure dependency to v0.4.2 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 31cd94c4c9b..9675a68c077 100644 --- a/bower.json +++ b/bower.json @@ -2,6 +2,6 @@ "name": "yui", "version": "3.16.0-pre", "devDependencies": { - "pure": "0.3.0" + "pure": "0.4.2" } } From 6e56c8c1234519d882206dcabd252893448ea021 Mon Sep 17 00:00:00 2001 From: Tilo Mitra Date: Mon, 3 Mar 2014 15:58:29 -0500 Subject: [PATCH 2/2] Add update cssnormalize and cssgrids module. These were created by running `grunt import-pure` --- src/cssgrids/HISTORY.md | 2 +- src/cssgrids/css/cssgrids-base.css | 4 +- src/cssgrids/css/cssgrids-responsive.css | 207 ++++++++------ src/cssgrids/css/cssgrids-units.css | 207 ++++++++------ src/cssnormalize/HISTORY.md | 2 +- src/cssnormalize/css/normalize-context.css | 305 ++++++++++++++++++++- src/cssnormalize/css/normalize.css | 26 +- 7 files changed, 564 insertions(+), 189 deletions(-) diff --git a/src/cssgrids/HISTORY.md b/src/cssgrids/HISTORY.md index 46022ea1770..44ff907b742 100644 --- a/src/cssgrids/HISTORY.md +++ b/src/cssgrids/HISTORY.md @@ -4,7 +4,7 @@ CSS Grids Change History @VERSION@ ------ -* No changes. +* Import Grids from Pure 0.4.2. You can now use non-reduced fraction class names when laying out a grid. This means that we have rules for classes such as `.pure-u-12-24` as well as `.pure-u-1-2`. 3.15.0 ------ diff --git a/src/cssgrids/css/cssgrids-base.css b/src/cssgrids/css/cssgrids-base.css index b16d87165db..06dcc57bda0 100644 --- a/src/cssgrids/css/cssgrids-base.css +++ b/src/cssgrids/css/cssgrids-base.css @@ -1,6 +1,6 @@ /*! -Pure v0.3.0 -Copyright 2013 Yahoo! Inc. All rights reserved. +Pure v0.4.2 +Copyright 2014 Yahoo! Inc. All rights reserved. Licensed under the BSD License. https://github.com/yui/pure/blob/master/LICENSE.md */ diff --git a/src/cssgrids/css/cssgrids-responsive.css b/src/cssgrids/css/cssgrids-responsive.css index 654d660043b..0cd745529c5 100644 --- a/src/cssgrids/css/cssgrids-responsive.css +++ b/src/cssgrids/css/cssgrids-responsive.css @@ -1,6 +1,6 @@ /*! -Pure v0.3.0 -Copyright 2013 Yahoo! Inc. All rights reserved. +Pure v0.4.2 +Copyright 2014 Yahoo! Inc. All rights reserved. Licensed under the BSD License. https://github.com/yui/pure/blob/master/LICENSE.md */ @@ -77,6 +77,7 @@ this the same font stack that Normalize.css sets for the `body`. } .yui3-u-1, +.yui3-u-1-1, .yui3-u-1-2, .yui3-u-1-3, .yui3-u-2-3, @@ -86,6 +87,7 @@ this the same font stack that Normalize.css sets for the `body`. .yui3-u-2-5, .yui3-u-3-5, .yui3-u-4-5, +.yui3-u-5-5, .yui3-u-1-6, .yui3-u-5-6, .yui3-u-1-8, @@ -97,16 +99,31 @@ this the same font stack that Normalize.css sets for the `body`. .yui3-u-7-12, .yui3-u-11-12, .yui3-u-1-24, +.yui3-u-2-24, +.yui3-u-3-24, +.yui3-u-4-24, .yui3-u-5-24, +.yui3-u-6-24, .yui3-u-7-24, +.yui3-u-8-24, +.yui3-u-9-24, +.yui3-u-10-24, .yui3-u-11-24, +.yui3-u-12-24, .yui3-u-13-24, +.yui3-u-14-24, +.yui3-u-15-24, +.yui3-u-16-24, .yui3-u-17-24, +.yui3-u-18-24, .yui3-u-19-24, -.yui3-u-23-24 { +.yui3-u-20-24, +.yui3-u-21-24, +.yui3-u-22-24, +.yui3-u-23-24, +.yui3-u-24-24 { display: inline-block; *display: inline; - /* IE < 8: fake inline-block */ zoom: 1; letter-spacing: normal; word-spacing: normal; @@ -114,128 +131,110 @@ this the same font stack that Normalize.css sets for the `body`. text-rendering: auto; } -.yui3-u-1 { - width: 100%; -} - -.yui3-u-1-2 { - width: 50%; - *width: 49.969%; -} - -.yui3-u-1-3 { - width: 33.3333%; - *width: 33.3023%; +.yui3-u-1-24 { + width: 4.1667%; + *width: 4.1357%; } -.yui3-u-2-3 { - width: 66.6667%; - *width: 66.6357%; +.yui3-u-1-12, +.yui3-u-2-24 { + width: 8.3333%; + *width: 8.3023%; } -.yui3-u-1-4 { - width: 25%; - *width: 24.969%; +.yui3-u-1-8, +.yui3-u-3-24 { + width: 12.5000%; + *width: 12.4690%; } -.yui3-u-3-4 { - width: 75%; - *width: 74.969%; +.yui3-u-1-6, +.yui3-u-4-24 { + width: 16.6667%; + *width: 16.6357%; } .yui3-u-1-5 { width: 20%; - *width: 19.969%; -} - -.yui3-u-2-5 { - width: 40%; - *width: 39.969%; -} - -.yui3-u-3-5 { - width: 60%; - *width: 59.969%; -} - -.yui3-u-4-5 { - width: 80%; - *width: 79.969%; + *width: 19.9690%; } -.yui3-u-1-6 { - width: 16.6667%; - *width: 16.6357%; -} - -.yui3-u-5-6 { - width: 83.3333%; - *width: 83.3023%; +.yui3-u-5-24 { + width: 20.8333%; + *width: 20.8023%; } -.yui3-u-1-8 { - width: 12.5%; - *width: 12.469%; +.yui3-u-1-4, +.yui3-u-6-24 { + width: 25%; + *width: 24.9690%; } -.yui3-u-3-8 { - width: 37.5%; - *width: 37.469%; +.yui3-u-7-24 { + width: 29.1667%; + *width: 29.1357%; } -.yui3-u-5-8 { - width: 62.5%; - *width: 62.469%; +.yui3-u-1-3, +.yui3-u-8-24 { + width: 33.3333%; + *width: 33.3023%; } -.yui3-u-7-8 { - width: 87.5%; - *width: 87.469%; +.yui3-u-3-8, +.yui3-u-9-24 { + width: 37.5000%; + *width: 37.4690%; } -.yui3-u-1-12 { - width: 8.3333%; - *width: 8.3023%; +.yui3-u-2-5 { + width: 40%; + *width: 39.9690%; } -.yui3-u-5-12 { +.yui3-u-5-12, +.yui3-u-10-24 { width: 41.6667%; *width: 41.6357%; } -.yui3-u-7-12 { - width: 58.3333%; - *width: 58.3023%; +.yui3-u-11-24 { + width: 45.8333%; + *width: 45.8023%; } -.yui3-u-11-12 { - width: 91.6667%; - *width: 91.6357%; +.yui3-u-1-2, +.yui3-u-12-24 { + width: 50%; + *width: 49.9690%; } -.yui3-u-1-24 { - width: 4.1667%; - *width: 4.1357%; +.yui3-u-13-24 { + width: 54.1667%; + *width: 54.1357%; } -.yui3-u-5-24 { - width: 20.8333%; - *width: 20.8023%; +.yui3-u-7-12, +.yui3-u-14-24 { + width: 58.3333%; + *width: 58.3023%; } -.yui3-u-7-24 { - width: 29.1667%; - *width: 29.1357%; +.yui3-u-3-5 { + width: 60%; + *width: 59.9690%; } -.yui3-u-11-24 { - width: 45.8333%; - *width: 45.8023%; +.yui3-u-5-8, +.yui3-u-15-24 { + width: 62.5000%; + *width: 62.4690%; } -.yui3-u-13-24 { - width: 54.1667%; - *width: 54.1357%; +.yui3-u-2-3, +.yui3-u-16-24 { + width: 66.6667%; + *width: 66.6357%; } .yui3-u-17-24 { @@ -243,16 +242,52 @@ this the same font stack that Normalize.css sets for the `body`. *width: 70.8023%; } +.yui3-u-3-4, +.yui3-u-18-24 { + width: 75%; + *width: 74.9690%; +} + .yui3-u-19-24 { width: 79.1667%; *width: 79.1357%; } +.yui3-u-4-5 { + width: 80%; + *width: 79.9690%; +} + +.yui3-u-5-6, +.yui3-u-20-24 { + width: 83.3333%; + *width: 83.3023%; +} + +.yui3-u-7-8, +.yui3-u-21-24 { + width: 87.5000%; + *width: 87.4690%; +} + +.yui3-u-11-12, +.yui3-u-22-24 { + width: 91.6667%; + *width: 91.6357%; +} + .yui3-u-23-24 { width: 95.8333%; *width: 95.8023%; } +.yui3-u-1, +.yui3-u-1-1, +.yui3-u-5-5, +.yui3-u-24-24 { + width: 100%; +} + /*csslint regex-selectors:false, known-properties:false, duplicate-properties:false*/ .yui3-g-r { diff --git a/src/cssgrids/css/cssgrids-units.css b/src/cssgrids/css/cssgrids-units.css index 5062fc3d679..d1ea0c216fa 100644 --- a/src/cssgrids/css/cssgrids-units.css +++ b/src/cssgrids/css/cssgrids-units.css @@ -1,11 +1,12 @@ /*! -Pure v0.3.0 -Copyright 2013 Yahoo! Inc. All rights reserved. +Pure v0.4.2 +Copyright 2014 Yahoo! Inc. All rights reserved. Licensed under the BSD License. https://github.com/yui/pure/blob/master/LICENSE.md */ .yui3-u-1, +.yui3-u-1-1, .yui3-u-1-2, .yui3-u-1-3, .yui3-u-2-3, @@ -15,6 +16,7 @@ https://github.com/yui/pure/blob/master/LICENSE.md .yui3-u-2-5, .yui3-u-3-5, .yui3-u-4-5, +.yui3-u-5-5, .yui3-u-1-6, .yui3-u-5-6, .yui3-u-1-8, @@ -26,16 +28,31 @@ https://github.com/yui/pure/blob/master/LICENSE.md .yui3-u-7-12, .yui3-u-11-12, .yui3-u-1-24, +.yui3-u-2-24, +.yui3-u-3-24, +.yui3-u-4-24, .yui3-u-5-24, +.yui3-u-6-24, .yui3-u-7-24, +.yui3-u-8-24, +.yui3-u-9-24, +.yui3-u-10-24, .yui3-u-11-24, +.yui3-u-12-24, .yui3-u-13-24, +.yui3-u-14-24, +.yui3-u-15-24, +.yui3-u-16-24, .yui3-u-17-24, +.yui3-u-18-24, .yui3-u-19-24, -.yui3-u-23-24 { +.yui3-u-20-24, +.yui3-u-21-24, +.yui3-u-22-24, +.yui3-u-23-24, +.yui3-u-24-24 { display: inline-block; *display: inline; - /* IE < 8: fake inline-block */ zoom: 1; letter-spacing: normal; word-spacing: normal; @@ -43,128 +60,110 @@ https://github.com/yui/pure/blob/master/LICENSE.md text-rendering: auto; } -.yui3-u-1 { - width: 100%; -} - -.yui3-u-1-2 { - width: 50%; - *width: 49.969%; -} - -.yui3-u-1-3 { - width: 33.3333%; - *width: 33.3023%; +.yui3-u-1-24 { + width: 4.1667%; + *width: 4.1357%; } -.yui3-u-2-3 { - width: 66.6667%; - *width: 66.6357%; +.yui3-u-1-12, +.yui3-u-2-24 { + width: 8.3333%; + *width: 8.3023%; } -.yui3-u-1-4 { - width: 25%; - *width: 24.969%; +.yui3-u-1-8, +.yui3-u-3-24 { + width: 12.5000%; + *width: 12.4690%; } -.yui3-u-3-4 { - width: 75%; - *width: 74.969%; +.yui3-u-1-6, +.yui3-u-4-24 { + width: 16.6667%; + *width: 16.6357%; } .yui3-u-1-5 { width: 20%; - *width: 19.969%; -} - -.yui3-u-2-5 { - width: 40%; - *width: 39.969%; -} - -.yui3-u-3-5 { - width: 60%; - *width: 59.969%; -} - -.yui3-u-4-5 { - width: 80%; - *width: 79.969%; + *width: 19.9690%; } -.yui3-u-1-6 { - width: 16.6667%; - *width: 16.6357%; -} - -.yui3-u-5-6 { - width: 83.3333%; - *width: 83.3023%; +.yui3-u-5-24 { + width: 20.8333%; + *width: 20.8023%; } -.yui3-u-1-8 { - width: 12.5%; - *width: 12.469%; +.yui3-u-1-4, +.yui3-u-6-24 { + width: 25%; + *width: 24.9690%; } -.yui3-u-3-8 { - width: 37.5%; - *width: 37.469%; +.yui3-u-7-24 { + width: 29.1667%; + *width: 29.1357%; } -.yui3-u-5-8 { - width: 62.5%; - *width: 62.469%; +.yui3-u-1-3, +.yui3-u-8-24 { + width: 33.3333%; + *width: 33.3023%; } -.yui3-u-7-8 { - width: 87.5%; - *width: 87.469%; +.yui3-u-3-8, +.yui3-u-9-24 { + width: 37.5000%; + *width: 37.4690%; } -.yui3-u-1-12 { - width: 8.3333%; - *width: 8.3023%; +.yui3-u-2-5 { + width: 40%; + *width: 39.9690%; } -.yui3-u-5-12 { +.yui3-u-5-12, +.yui3-u-10-24 { width: 41.6667%; *width: 41.6357%; } -.yui3-u-7-12 { - width: 58.3333%; - *width: 58.3023%; +.yui3-u-11-24 { + width: 45.8333%; + *width: 45.8023%; } -.yui3-u-11-12 { - width: 91.6667%; - *width: 91.6357%; +.yui3-u-1-2, +.yui3-u-12-24 { + width: 50%; + *width: 49.9690%; } -.yui3-u-1-24 { - width: 4.1667%; - *width: 4.1357%; +.yui3-u-13-24 { + width: 54.1667%; + *width: 54.1357%; } -.yui3-u-5-24 { - width: 20.8333%; - *width: 20.8023%; +.yui3-u-7-12, +.yui3-u-14-24 { + width: 58.3333%; + *width: 58.3023%; } -.yui3-u-7-24 { - width: 29.1667%; - *width: 29.1357%; +.yui3-u-3-5 { + width: 60%; + *width: 59.9690%; } -.yui3-u-11-24 { - width: 45.8333%; - *width: 45.8023%; +.yui3-u-5-8, +.yui3-u-15-24 { + width: 62.5000%; + *width: 62.4690%; } -.yui3-u-13-24 { - width: 54.1667%; - *width: 54.1357%; +.yui3-u-2-3, +.yui3-u-16-24 { + width: 66.6667%; + *width: 66.6357%; } .yui3-u-17-24 { @@ -172,12 +171,48 @@ https://github.com/yui/pure/blob/master/LICENSE.md *width: 70.8023%; } +.yui3-u-3-4, +.yui3-u-18-24 { + width: 75%; + *width: 74.9690%; +} + .yui3-u-19-24 { width: 79.1667%; *width: 79.1357%; } +.yui3-u-4-5 { + width: 80%; + *width: 79.9690%; +} + +.yui3-u-5-6, +.yui3-u-20-24 { + width: 83.3333%; + *width: 83.3023%; +} + +.yui3-u-7-8, +.yui3-u-21-24 { + width: 87.5000%; + *width: 87.4690%; +} + +.yui3-u-11-12, +.yui3-u-22-24 { + width: 91.6667%; + *width: 91.6357%; +} + .yui3-u-23-24 { width: 95.8333%; *width: 95.8023%; +} + +.yui3-u-1, +.yui3-u-1-1, +.yui3-u-5-5, +.yui3-u-24-24 { + width: 100%; } \ No newline at end of file diff --git a/src/cssnormalize/HISTORY.md b/src/cssnormalize/HISTORY.md index 65ba67aa47d..998e3085711 100644 --- a/src/cssnormalize/HISTORY.md +++ b/src/cssnormalize/HISTORY.md @@ -4,7 +4,7 @@ CSS Normalize Change History @VERSION@ ------ -* No changes. +* Import Base from Pure 0.4.2. You can now set a `[hidden]` attribute to your HTML elements if you want them to be `display: none;`. 3.15.0 ------ diff --git a/src/cssnormalize/css/normalize-context.css b/src/cssnormalize/css/normalize-context.css index 8cfebcad454..7d3c61c76ca 100644 --- a/src/cssnormalize/css/normalize-context.css +++ b/src/cssnormalize/css/normalize-context.css @@ -1,15 +1,25 @@ /*! -Pure v0.3.0 -Copyright 2013 Yahoo! Inc. All rights reserved. +Pure v0.4.2 +Copyright 2014 Yahoo! Inc. All rights reserved. Licensed under the BSD License. https://github.com/yui/pure/blob/master/LICENSE.md */ /*! -normalize.css v1.1.2 | MIT License | git.io/normalize +normalize.css v1.1.3 | MIT License | git.io/normalize Copyright (c) Nicolas Gallagher and Jonathan Neal */ +/*! normalize.css v1.1.3 | MIT License | git.io/normalize */ + +/* ========================================================================== + HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined in IE 6/7/8/9 and Firefox 3. + */ + .yui3-normalized article, .yui3-normalized aside, .yui3-normalized details, @@ -25,27 +35,62 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal display: block; } +/** + * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. + */ + .yui3-normalized audio, .yui3-normalized canvas, .yui3-normalized video { display: inline-block; + *display: inline; + *zoom: 1; } +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + .yui3-normalized audio:not([controls]) { display: none; height: 0; } +/** + * Address styling not present in IE 7/8/9, Firefox 3, and Safari 4. + * Known issue: no IE 6 support. + */ + .yui3-normalized [hidden] { display: none; } +/* ========================================================================== + Base + ========================================================================== */ + +/** + * 1. Correct text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + .yui3-normalized { font-size: 100%; + /* 1 */ -ms-text-size-adjust: 100%; + /* 2 */ -webkit-text-size-adjust: 100%; + /* 2 */ } +/** + * Address `font-family` inconsistency between `textarea` and other form + * elements. + */ + .yui3-normalized, .yui3-normalized button, .yui3-normalized input, @@ -54,19 +99,45 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal font-family: sans-serif; } -.yui3-normalized body { +/** + * Address margins handled incorrectly in IE 6/7. + */ + +.yui3-normalized { margin: 0; } +/* ========================================================================== + Links + ========================================================================== */ + +/** + * Address `outline` inconsistency between Chrome and other browsers. + */ + .yui3-normalized a:focus { outline: thin dotted; } +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + .yui3-normalized a:active, .yui3-normalized a:hover { outline: 0; } +/* ========================================================================== + Typography + ========================================================================== */ + +/** + * 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. + */ + .yui3-normalized h1 { font-size: 2em; margin: 0.67em 0; @@ -97,10 +168,18 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal margin: 2.33em 0; } +/** + * Address styling not present in IE 7/8/9, Safari 5, and Chrome. + */ + .yui3-normalized abbr[title] { border-bottom: 1px dotted; } +/** + * Address style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. + */ + .yui3-normalized b, .yui3-normalized strong { font-weight: bold; @@ -110,55 +189,96 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal margin: 1em 40px; } +/** + * Address styling not present in Safari 5 and Chrome. + */ + .yui3-normalized dfn { font-style: italic; } +/** + * Address differences between Firefox and other browsers. + * Known issue: no IE 6/7 normalization. + */ + .yui3-normalized hr { -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } +/** + * Address styling not present in IE 6/7/8/9. + */ + .yui3-normalized mark { background: #ff0; color: #000; } +/** + * Address margins set differently in IE 6/7. + */ + .yui3-normalized p, .yui3-normalized pre { margin: 1em 0; } +/** + * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. + */ + .yui3-normalized code, .yui3-normalized kbd, .yui3-normalized pre, .yui3-normalized samp { - font-family: monospace , serif; - _font-family: 'courier new' , monospace; + font-family: monospace, serif; + _font-family: 'courier new', monospace; font-size: 1em; } +/** + * Improve readability of pre-formatted text in all browsers. + */ + .yui3-normalized pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } +/** + * Address CSS quotes not supported in IE 6/7. + */ + .yui3-normalized q { quotes: none; } +/** + * Address `quotes` property not supported in Safari 4. + */ + .yui3-normalized q:before, .yui3-normalized q:after { content: ''; content: none; } +/** + * Address inconsistent and variable font size in all browsers. + */ + .yui3-normalized small { font-size: 80%; } +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + .yui3-normalized sub, .yui3-normalized sup { font-size: 75%; @@ -175,6 +295,14 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal bottom: -0.25em; } +/* ========================================================================== + Lists + ========================================================================== */ + +/** + * Address margins set differently in IE 6/7. + */ + .yui3-normalized dl, .yui3-normalized menu, .yui3-normalized ol, @@ -186,109 +314,268 @@ Copyright (c) Nicolas Gallagher and Jonathan Neal margin: 0 0 0 40px; } +/** + * Address paddings set differently in IE 6/7. + */ + .yui3-normalized menu, .yui3-normalized ol, .yui3-normalized ul { padding: 0 0 0 40px; } -.yui3-normalized nav ul, -.yui3-normalized nav ol { +/** + * Correct list images handled incorrectly in IE 7. + */ + +.yui3-normalized nav ul, +.yui3-normalized nav ol { list-style: none; list-style-image: none; } +/* ========================================================================== + Embedded content + ========================================================================== */ + +/** + * 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. + */ + .yui3-normalized img { border: 0; + /* 1 */ -ms-interpolation-mode: bicubic; + /* 2 */ } +/** + * Correct overflow displayed oddly in IE 9. + */ + .yui3-normalized svg:not(:root) { overflow: hidden; } +/* ========================================================================== + Figures + ========================================================================== */ + +/** + * Address margin not present in IE 6/7/8/9, Safari 5, and Opera 11. + */ + .yui3-normalized figure { margin: 0; } +/* ========================================================================== + Forms + ========================================================================== */ + +/** + * Correct margin displayed oddly in IE 6/7. + */ + .yui3-normalized form { margin: 0; } +/** + * Define consistent border, margin, and padding. + */ + .yui3-normalized fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } +/** + * 1. Correct color not being inherited in IE 6/7/8/9. + * 2. Correct text not wrapping in Firefox 3. + * 3. Correct alignment displayed oddly in IE 6/7. + */ + .yui3-normalized legend { border: 0; + /* 1 */ padding: 0; white-space: normal; + /* 2 */ + *margin-left: -7px; + /* 3 */ } +/** + * 1. Correct font size not being inherited in all browsers. + * 2. Address margins set differently in IE 6/7, Firefox 3+, Safari 5, + * and Chrome. + * 3. Improve appearance and consistency in all browsers. + */ + .yui3-normalized button, .yui3-normalized input, .yui3-normalized select, .yui3-normalized textarea { font-size: 100%; + /* 1 */ margin: 0; + /* 2 */ vertical-align: baseline; + /* 3 */ + *vertical-align: middle; + /* 3 */ } +/** + * Address Firefox 3+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + .yui3-normalized button, .yui3-normalized 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 6+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + .yui3-normalized button, .yui3-normalized 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. Remove inner spacing in IE 7 without affecting normal text inputs. + * Known issue: inner spacing remains in IE 6. + */ + .yui3-normalized button, .yui3-normalized input[type="button"], -.yui3-normalized input[type="reset"], +.yui3-normalized /* 1 */ +input[type="reset"], .yui3-normalized input[type="submit"] { -webkit-appearance: button; + /* 2 */ cursor: pointer; + /* 3 */ + *overflow: visible; + /* 4 */ } +/** + * Re-set default cursor for disabled elements. + */ + .yui3-normalized button[disabled], .yui3-normalized 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. Remove excess padding in IE 7. + * Known issue: excess padding remains in IE 6. + */ + .yui3-normalized input[type="checkbox"], .yui3-normalized input[type="radio"] { box-sizing: border-box; + /* 1 */ padding: 0; + /* 2 */ + *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). + */ + .yui3-normalized 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. + */ + .yui3-normalized input[type="search"]::-webkit-search-cancel-button, .yui3-normalized input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } +/** + * Remove inner padding and border in Firefox 3+. + */ + .yui3-normalized button::-moz-focus-inner, .yui3-normalized input::-moz-focus-inner { border: 0; padding: 0; } +/** + * 1. Remove default vertical scrollbar in IE 6/7/8/9. + * 2. Improve readability and alignment in all browsers. + */ + .yui3-normalized textarea { overflow: auto; + /* 1 */ vertical-align: top; + /* 2 */ } +/* ========================================================================== + Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + .yui3-normalized table { border-collapse: collapse; border-spacing: 0; +} + +/*csslint important:false*/ + +/* ========================================================================== + Pure Base Extras + ========================================================================== */ + +/** + * Extra rules that Pure adds on top of Normalize.css + */ + +/** + * Always hide an element when it has the `hidden` HTML attribute. + */ + +.yui3-normalized [hidden] { + display: none !important; } \ No newline at end of file diff --git a/src/cssnormalize/css/normalize.css b/src/cssnormalize/css/normalize.css index 984182a9f0a..461c5116754 100644 --- a/src/cssnormalize/css/normalize.css +++ b/src/cssnormalize/css/normalize.css @@ -1,16 +1,16 @@ /*! -Pure v0.3.0 -Copyright 2013 Yahoo! Inc. All rights reserved. +Pure v0.4.2 +Copyright 2014 Yahoo! Inc. All rights reserved. Licensed under the BSD License. https://github.com/yui/pure/blob/master/LICENSE.md */ /*! -normalize.css v1.1.2 | MIT License | git.io/normalize +normalize.css v1.1.3 | MIT License | git.io/normalize Copyright (c) Nicolas Gallagher and Jonathan Neal */ -/*! normalize.css v1.1.2 | MIT License | git.io/normalize */ +/*! normalize.css v1.1.3 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions @@ -560,4 +560,22 @@ textarea { table { border-collapse: collapse; border-spacing: 0; +} + +/*csslint important:false*/ + +/* ========================================================================== + Pure Base Extras + ========================================================================== */ + +/** + * Extra rules that Pure adds on top of Normalize.css + */ + +/** + * Always hide an element when it has the `hidden` HTML attribute. + */ + +[hidden] { + display: none !important; } \ No newline at end of file