From bfb2ebe88be7cc6ba44cfe84ddbeaaebede79572 Mon Sep 17 00:00:00 2001 From: Matt Farmer Date: Thu, 19 Apr 2012 15:47:27 -0400 Subject: [PATCH] Fix ordering of font properties in reset-font for FF's benefit. Firefox gets persnickety about how regular CSS properties and shorthand properties interact, specifically specifying a shorthand version after the regular property causes the regular property to be overriden. Closes GH-852. --- frameworks/compass/stylesheets/compass/reset/_utilities.scss | 2 +- test/fixtures/stylesheets/blueprint/css/screen.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/reset/_utilities.scss b/frameworks/compass/stylesheets/compass/reset/_utilities.scss index 41d5add8..d9d03f17 100644 --- a/frameworks/compass/stylesheets/compass/reset/_utilities.scss +++ b/frameworks/compass/stylesheets/compass/reset/_utilities.scss @@ -67,8 +67,8 @@ // Reset the font and vertical alignment. @mixin reset-font { - font-size: 100%; font: inherit; + font-size: 100%; vertical-align: baseline; } // Resets the outline when focus. diff --git a/test/fixtures/stylesheets/blueprint/css/screen.css b/test/fixtures/stylesheets/blueprint/css/screen.css index 391a8e02..371836e6 100644 --- a/test/fixtures/stylesheets/blueprint/css/screen.css +++ b/test/fixtures/stylesheets/blueprint/css/screen.css @@ -14,8 +14,8 @@ time, mark, audio, video { margin: 0; padding: 0; border: 0; - font-size: 100%; font: inherit; + font-size: 100%; vertical-align: baseline; } body {