From 00c93310e5eb11ca5cd851d9510f5750b237c5ca Mon Sep 17 00:00:00 2001 From: Brian Cray Date: Wed, 18 Apr 2012 11:37:33 -0300 Subject: [PATCH 1/2] Update normalize.css --- normalize.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/normalize.css b/normalize.css index 4474dee25..683499714 100644 --- a/normalize.css +++ b/normalize.css @@ -1,4 +1,5 @@ -/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */ +/*! normalize.css modified for PXtoEM.com + normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */ /* ============================================================================= HTML5 display definitions @@ -66,9 +67,9 @@ audio:not([controls]) { */ html { - font-size: 100%; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ + font-size: {{ base_font_size }}; /* 1 */ + -webkit-text-size-adjust: {{ base_font_size }}; /* 2 */ + -ms-text-size-adjust: {{ base_font_size }}; /* 2 */ } /* From a6147a6318871b44e818d5ed568d816764283603 Mon Sep 17 00:00:00 2001 From: Brian Cray Date: Wed, 18 Apr 2012 11:42:12 -0300 Subject: [PATCH 2/2] Update normalize.css --- normalize.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/normalize.css b/normalize.css index 683499714..91385b7b3 100644 --- a/normalize.css +++ b/normalize.css @@ -1,4 +1,4 @@ -/*! normalize.css modified for PXtoEM.com +/*! normalize.css modified for PXtoEM.com at {{ base_font_size_px }} normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */ /* ============================================================================= @@ -67,9 +67,9 @@ audio:not([controls]) { */ html { - font-size: {{ base_font_size }}; /* 1 */ - -webkit-text-size-adjust: {{ base_font_size }}; /* 2 */ - -ms-text-size-adjust: {{ base_font_size }}; /* 2 */ + font-size: {{ base_font_size_em }}; /* 1 */ + -webkit-text-size-adjust: {{ base_font_size_em }}; /* 2 */ + -ms-text-size-adjust: {{ base_font_size_em }}; /* 2 */ } /*