From 7ddd0dc7ce00e2922a9601f63e00a2e347efd995 Mon Sep 17 00:00:00 2001 From: Eric Ferraiuolo Date: Thu, 23 May 2013 13:59:13 +0100 Subject: [PATCH] Import Normalize.css @ 1.1.2 --- HISTORY.md | 2 ++ src/base/css/normalize-context.css | 4 +--- src/base/css/normalize.css | 18 ++++++------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index d33c442..6227418 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,8 @@ Pure Change History NEXT ---- +* Upgraded Normalize.css to 1.1.2. + * Integrated Bower into `grunt import` process. * Cleaned up manual test files, removing unnecessary CSS files and cruft. diff --git a/src/base/css/normalize-context.css b/src/base/css/normalize-context.css index 3af107e..c2adb00 100644 --- a/src/base/css/normalize-context.css +++ b/src/base/css/normalize-context.css @@ -26,11 +26,9 @@ display: none; } .pure { - background: #fff; - color: #000; font-size: 100%; - -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } .pure, .pure button, diff --git a/src/base/css/normalize.css b/src/base/css/normalize.css index 5fc894c..c1bed0a 100644 --- a/src/base/css/normalize.css +++ b/src/base/css/normalize.css @@ -1,5 +1,5 @@ /* THIS FILE IS GENERATED BY A BUILD SCRIPT - DO NOT EDIT! */ -/*! normalize.css v1.1.1 | MIT License | git.io/normalize */ +/*! normalize.css v1.1.2 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions @@ -60,22 +60,16 @@ audio:not([controls]) { ========================================================================== */ /** - * 1. Prevent system color scheme's background color being used in Firefox, IE, - * and Opera. - * 2. Prevent system color scheme's text color being used in Firefox, IE, and - * Opera. - * 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using + * 1. Correct text resizing oddly in IE 6/7 when body `font-size` is set using * `em` units. - * 4. Prevent iOS text size adjust after orientation change, without disabling + * 2. Prevent iOS text size adjust after orientation change, without disabling * user zoom. */ html { - background: #fff; /* 1 */ - color: #000; /* 2 */ - font-size: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 4 */ - -ms-text-size-adjust: 100%; /* 4 */ + font-size: 100%; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } /**