From b56697918014a9561fd6652ab303ffbac51a97f5 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 13:09:24 -0700 Subject: [PATCH 01/18] Allow Importer objects to be placed onto the load path using add_import_path. Closes #392. --- lib/compass/configuration/adapters.rb | 10 ++++++++-- test/units/configuration_test.rb | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/lib/compass/configuration/adapters.rb b/lib/compass/configuration/adapters.rb index 215982fd..a139de1f 100644 --- a/lib/compass/configuration/adapters.rb +++ b/lib/compass/configuration/adapters.rb @@ -13,8 +13,13 @@ module Compass Compass::Frameworks::ALL.each do |framework| locations << [framework.stylesheets_directory, File.join(css_path || css_dir || ".", framework.name)] end + load_paths = [] resolve_additional_import_paths.each do |additional_path| - locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))] + if additional_path.is_a?(String) + locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))] + else + load_paths << additional_path + end end plugin_opts = {:template_location => locations} plugin_opts[:style] = output_style if output_style @@ -23,13 +28,14 @@ module Compass plugin_opts[:cache_location] = cache_path unless cache_path.nil? plugin_opts.merge!(sass_options || {}) plugin_opts[:load_paths] ||= [] + plugin_opts[:load_paths] += load_paths plugin_opts[:load_paths] << Compass::SpriteImporter.new plugin_opts end def resolve_additional_import_paths (additional_import_paths || []).map do |path| - if project_path && !absolute_path?(path) + if path.is_a?(String) && project_path && !absolute_path?(path) File.join(project_path, path) else path diff --git a/test/units/configuration_test.rb b/test/units/configuration_test.rb index c383aec8..623ff8cc 100644 --- a/test/units/configuration_test.rb +++ b/test/units/configuration_test.rb @@ -240,6 +240,21 @@ EXPECTED assert_correct expected_serialization.split("\n"), Compass.configuration.serialize.split("\n") end + def test_additional_import_paths_can_be_importers + contents = StringIO.new(<<-CONFIG) + http_path = "/" + project_path = "/home/chris/my_compass_project" + css_dir = "css" + additional_import_paths = ["../foo"] + add_import_path Sass::Importers::Filesystem.new("/tmp/foo") + CONFIG + + Compass.add_configuration(contents, "test_additional_import_paths") + + assert Compass.configuration.sass_load_paths.find{|p| p.is_a?(Sass::Importers::Filesystem) && p.root == "/tmp/foo"} + assert Compass.configuration.to_sass_plugin_options[:load_paths].find{|p| p.is_a?(Sass::Importers::Filesystem) && p.root == "/tmp/foo"} + end + def test_config_with_pathname contents = StringIO.new(<<-CONFIG) http_path = "/" From 7ba0d44eaa46d4078a9bb1ab7a1699600ba6908d Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 14:14:20 -0700 Subject: [PATCH 02/18] Make Pathname objects work with add_import_path --- lib/compass/configuration/data.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/compass/configuration/data.rb b/lib/compass/configuration/data.rb index 30c5e7c2..93e3be62 100644 --- a/lib/compass/configuration/data.rb +++ b/lib/compass/configuration/data.rb @@ -79,6 +79,7 @@ module Compass end def add_import_path(*paths) + paths.map!{|p| defined?(Pathname) && Pathname === p ? p.to_s : p} # The @added_import_paths variable works around an issue where # the additional_import_paths gets overwritten during parse @added_import_paths ||= [] From ba677ad5d29bc40ab5dadb879aaacf53aa97fa0a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 14:15:31 -0700 Subject: [PATCH 03/18] Add a -I option to the global options so that you can add sass import paths via the CLI. Closes #375. --- lib/compass/exec/global_options_parser.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/compass/exec/global_options_parser.rb b/lib/compass/exec/global_options_parser.rb index 0f52225b..911dc9fe 100644 --- a/lib/compass/exec/global_options_parser.rb +++ b/lib/compass/exec/global_options_parser.rb @@ -26,6 +26,13 @@ module Compass::Exec::GlobalOptionsParser ::Compass.configuration.discover Pathname.new(frameworks_dir).realpath end + opts.on('-I IMPORT_PATH', + "Makes files under the IMPORT_PATH folder findable by Sass's @import directive." + ) do |import_path| + require 'pathname' + ::Compass.configuration.add_import_path Pathname.new(import_path).realpath + end + opts.on('-q', '--quiet', :NONE, 'Quiet mode.') do self.options[:quiet] = true end From 99d0fe145761fc01ced700a65ba458034dbff1a9 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 14:20:07 -0700 Subject: [PATCH 04/18] Better description for the --force option. --- lib/compass/exec/global_options_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/exec/global_options_parser.rb b/lib/compass/exec/global_options_parser.rb index 911dc9fe..aeba2aea 100644 --- a/lib/compass/exec/global_options_parser.rb +++ b/lib/compass/exec/global_options_parser.rb @@ -41,7 +41,7 @@ module Compass::Exec::GlobalOptionsParser self.options[:trace] = true end - opts.on('--force', :NONE, 'Allows some failing commands to succeed instead.') do + opts.on('--force', :NONE, 'Allows compass to overwrite existing files.') do self.options[:force] = true end From 8066f984d2b3816e959f27bd2063eee51eb514ce Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 14:20:20 -0700 Subject: [PATCH 05/18] Update changelog. --- doc-src/content/CHANGELOG.markdown | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index 746f508f..074bed04 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -22,8 +22,12 @@ The Documentation for the [latest preview release](http://beta.compass-style.org * [Vertical Rhythm Module] The `establish-baseline` mixin now styles the `` element instead of the `` element. This makes the vertical rhythm module work better with `rem` based measurements. -* [CSS3] Add 3D transform support for Mozillia, IE, and Opera. -* [CSS3] Add `-ms` support for css3 columns. Add support for the columns shorthand property. +* [CSS3] Added 3D transform support for Mozillia, IE, and Opera. +* [CSS3] Added `-ms` support for css3 columns. Add support for the columns shorthand property. +* [CLI] Added a `-I` option for adding sass import paths via the CLI during compilation and project set up. +* [Configuration] For better ruby and rails integration, the `add_import_path` command now accepts + [Sass::Importer](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#custom_importers) objects + and [Ruby Pathname](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/pathname/rdoc/Pathname.html) objects. 0.12.1 (03/14/2012) ------------------- From 3f96108688c0456eceea02ba724caf9aff740c0a Mon Sep 17 00:00:00 2001 From: JohnAlbin Date: Thu, 15 Mar 2012 01:09:53 +0800 Subject: [PATCH 06/18] Update docs for reset-baseline() in vertical_rhythm partial. --- .../stylesheets/compass/typography/_vertical_rhythm.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss index 6184c03b..9ce0d8ab 100644 --- a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +++ b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss @@ -67,7 +67,8 @@ $base-half-leader: $base-leader / 2; } } -// resets the baseline to 1 leading unit +// Resets the line-height to 1 vertical rhythm unit. Does not work in all +// circumstances. @mixin reset-baseline { @include adjust-leading-to(1, if($relative-font-sizing, $base-font-size, $base-font-size)); } From 1aca9604015ea4d04ed52dacd5580e1c9c17a072 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 15:18:01 -0700 Subject: [PATCH 07/18] Iterate on the doc changes for the reset-baseline mixin --- .../stylesheets/compass/typography/_vertical_rhythm.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss index 9ce0d8ab..accdfe21 100644 --- a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +++ b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss @@ -67,8 +67,11 @@ $base-half-leader: $base-leader / 2; } } -// Resets the line-height to 1 vertical rhythm unit. Does not work in all -// circumstances. +// Resets the line-height to 1 vertical rhythm unit. +// Does not work on elements whose font-size is different from $base-font-size. +// +// @deprecated This mixin will be removed in the next release. +// Please use the `adjust-leading-to` mixin instead. @mixin reset-baseline { @include adjust-leading-to(1, if($relative-font-sizing, $base-font-size, $base-font-size)); } From 81b798d6315ce0a27d5f6ad43ad4ca28637c42b2 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 18 Mar 2012 22:15:10 -0700 Subject: [PATCH 08/18] lock down nanoc because newer versions cause issues. --- doc-src/Gemfile | 3 ++- doc-src/Gemfile.lock | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc-src/Gemfile b/doc-src/Gemfile index e8e53e31..49173836 100644 --- a/doc-src/Gemfile +++ b/doc-src/Gemfile @@ -1,6 +1,7 @@ source :gemcutter -gem 'nanoc3' +gem 'nanoc', "3.2.4" +gem 'nanoc3', "3.2.4" gem 'asdf' gem 'rdiscount' gem 'thor' diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 60f18cc7..684c6a85 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - compass (0.12.1.004f696) + compass (0.12.1.1aca960) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -26,7 +26,7 @@ GEM coderay (0.9.7) compass-susy-plugin (0.7.0) compass (>= 0.10.0) - cri (2.0.2) + cri (2.2.1) css-slideshow (0.2.0) compass (>= 0.10.0.rc3) css_parser (1.0.1) @@ -35,7 +35,9 @@ GEM i18n (0.4.2) json (1.5.4) mime-types (1.16) - nanoc3 (3.2.2) + nanoc (3.2.4) + nanoc3 (>= 3.2.4) + nanoc3 (3.2.4) cri (~> 2.0) nokogiri (1.4.4) rack (1.2.2) @@ -66,7 +68,8 @@ DEPENDENCIES haml json mime-types - nanoc3 + nanoc (= 3.2.4) + nanoc3 (= 3.2.4) nokogiri rack rake From a4df58d0544c310b3dabb85eec686d45d417bc4a Mon Sep 17 00:00:00 2001 From: Joschka Date: Sat, 24 Mar 2012 13:29:05 +0100 Subject: [PATCH 09/18] Remove unused -o-border-radius and -ms-border-radius --- .../stylesheets/compass/css3/_border-radius.scss | 14 ++++---------- .../stylesheets/compass/css/border_radius.css | 6 ------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_border-radius.scss b/frameworks/compass/stylesheets/compass/css3/_border-radius.scss index d367a97c..2da90226 100644 --- a/frameworks/compass/stylesheets/compass/css3/_border-radius.scss +++ b/frameworks/compass/stylesheets/compass/css3/_border-radius.scss @@ -21,24 +21,18 @@ $default-border-radius: 5px !default; // .simple { // -webkit-border-radius: 4px 4px; // -moz-border-radius: 4px / 4px; -// -o-border-radius: 4px / 4px; -// -ms-border-radius: 4px / 4px; // -khtml-border-radius: 4px / 4px; // border-radius: 4px / 4px; } // // .compound { // -webkit-border-radius: 2px 3px; // -moz-border-radius: 2px 5px / 3px 6px; -// -o-border-radius: 2px 5px / 3px 6px; -// -ms-border-radius: 2px 5px / 3px 6px; // -khtml-border-radius: 2px 5px / 3px 6px; // border-radius: 2px 5px / 3px 6px; } // // .crazy { // -webkit-border-radius: 1px 2px; // -moz-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; -// -o-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; -// -ms-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; // -khtml-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; // border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; } @@ -58,8 +52,8 @@ $default-border-radius: 5px !default; @include experimental("border-radius", $radius unquote("/") $vertical-radius, -moz, not -webkit, - -o, - -ms, + not -o, + not -ms, -khtml, official ); @@ -87,8 +81,8 @@ $default-border-radius: 5px !default; @include experimental("border-#{$vert}-#{$horz}-radius", $radius, not -moz, -webkit, - -o, - -ms, + not -o, + not -ms, -khtml, official ); diff --git a/test/fixtures/stylesheets/compass/css/border_radius.css b/test/fixtures/stylesheets/compass/css/border_radius.css index 3b2452fc..c4fb89c8 100644 --- a/test/fixtures/stylesheets/compass/css/border_radius.css +++ b/test/fixtures/stylesheets/compass/css/border_radius.css @@ -1,20 +1,14 @@ .simple { -webkit-border-radius: 4px 4px; -moz-border-radius: 4px / 4px; - -ms-border-radius: 4px / 4px; - -o-border-radius: 4px / 4px; border-radius: 4px / 4px; } .compound { -webkit-border-radius: 2px 3px; -moz-border-radius: 2px 5px / 3px 6px; - -ms-border-radius: 2px 5px / 3px 6px; - -o-border-radius: 2px 5px / 3px 6px; border-radius: 2px 5px / 3px 6px; } .crazy { -webkit-border-radius: 1px 2px; -moz-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; - -ms-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; - -o-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; } From 6ae8a0e57a786b8742b243deebd99405f9a6d535 Mon Sep 17 00:00:00 2001 From: bukhamseen Date: Wed, 28 Mar 2012 02:54:19 +0300 Subject: [PATCH 10/18] Link to sass reference documentation fixed. --- doc-src/content/reference/compass/helpers/colors.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-src/content/reference/compass/helpers/colors.haml b/doc-src/content/reference/compass/helpers/colors.haml index 3c49e423..f1566a61 100644 --- a/doc-src/content/reference/compass/helpers/colors.haml +++ b/doc-src/content/reference/compass/helpers/colors.haml @@ -18,7 +18,7 @@ documented_functions: %p These color functions are useful for creating generic libraries that have to accept a range of inputs. For more color functions see - the sass reference + the sass reference documentation #adjust-lightness.helper From 5f7473126aa5c22bef3e27a53d8429148ff6b63c Mon Sep 17 00:00:00 2001 From: Mehdi Kabab Date: Thu, 29 Mar 2012 13:42:10 +0200 Subject: [PATCH 11/18] Fixes the sprite Magic Selectors. --- lib/compass/sass_extensions/functions/sprites.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/sass_extensions/functions/sprites.rb b/lib/compass/sass_extensions/functions/sprites.rb index b8e97d4c..08d981f9 100644 --- a/lib/compass/sass_extensions/functions/sprites.rb +++ b/lib/compass/sass_extensions/functions/sprites.rb @@ -110,7 +110,7 @@ module Compass::SassExtensions::Functions::Sprites unless VALID_SELECTORS.include?(selector.value) raise Sass::SyntaxError, "Invalid Selctor did you mean one of: #{VALID_SELECTORS.join(', ')}" end - Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite) + Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value) end Sass::Script::Functions.declare :sprite_has_selector, [:map, :sprite, :selector] From 6ad3bd73a7085f2a9edb09671e2b952647055c2f Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Tue, 10 Apr 2012 17:33:07 -0600 Subject: [PATCH 12/18] update documentation for appearance module --- .../compass/stylesheets/compass/css3/_appearance.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_appearance.scss b/frameworks/compass/stylesheets/compass/css3/_appearance.scss index 128fe4d9..1905e43a 100644 --- a/frameworks/compass/stylesheets/compass/css3/_appearance.scss +++ b/frameworks/compass/stylesheets/compass/css3/_appearance.scss @@ -1,9 +1,11 @@ @import "shared"; -// Change the appearance for Mozilla, Webkit and the future +// Change the appearance for Mozilla, Webkit and possibly the future. +// The appearance property is currently not present in any newer CSS specification. // -// @param $ap -// [ none | normal | icon | window | button | menu | field ] +// There is no official list of accepted values, but you might check these source: +// Mozilla : https://developer.mozilla.org/en/CSS/-moz-appearance +// Webkit : (unofficial) http://css-infos.net/property/-webkit-appearance @mixin appearance($ap) { $ap: unquote($ap); From 2af118ec83b78b97a2c64a86e113ea30ebc8854e Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Tue, 10 Apr 2012 17:44:56 -0600 Subject: [PATCH 13/18] update -webkit-appearance link --- frameworks/compass/stylesheets/compass/css3/_appearance.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_appearance.scss b/frameworks/compass/stylesheets/compass/css3/_appearance.scss index 1905e43a..c5951f6c 100644 --- a/frameworks/compass/stylesheets/compass/css3/_appearance.scss +++ b/frameworks/compass/stylesheets/compass/css3/_appearance.scss @@ -5,8 +5,8 @@ // // There is no official list of accepted values, but you might check these source: // Mozilla : https://developer.mozilla.org/en/CSS/-moz-appearance -// Webkit : (unofficial) http://css-infos.net/property/-webkit-appearance - +// Webkit : http://developer.apple.com/library/safari/#documentation/appleapplications/reference/safaricssref/articles/standardcssproperties.html + @mixin appearance($ap) { $ap: unquote($ap); @include experimental(appearance, $ap, From c00ae82595e0c7207dbaff29a67aa424a235edbb Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Tue, 10 Apr 2012 17:57:23 -0600 Subject: [PATCH 14/18] final official link to webkit appearance values --- frameworks/compass/stylesheets/compass/css3/_appearance.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_appearance.scss b/frameworks/compass/stylesheets/compass/css3/_appearance.scss index c5951f6c..e238f017 100644 --- a/frameworks/compass/stylesheets/compass/css3/_appearance.scss +++ b/frameworks/compass/stylesheets/compass/css3/_appearance.scss @@ -5,8 +5,9 @@ // // There is no official list of accepted values, but you might check these source: // Mozilla : https://developer.mozilla.org/en/CSS/-moz-appearance -// Webkit : http://developer.apple.com/library/safari/#documentation/appleapplications/reference/safaricssref/articles/standardcssproperties.html - +// Webkit : http://code.google.com/p/webkit-mirror/source/browse/Source/WebCore/css/CSSValueKeywords.in?spec=svnf1aea559dcd025a8946aa7da6e4e8306f5c1b604&r=63c7d1af44430b314233fea342c3ddb2a052e365 +// (search for 'appearance' within the page) + @mixin appearance($ap) { $ap: unquote($ap); @include experimental(appearance, $ap, From c5041fbcb9a1a06c95f8e1b1d05201e492afb875 Mon Sep 17 00:00:00 2001 From: JohnAlbin Date: Sat, 14 Apr 2012 11:18:59 +0800 Subject: [PATCH 15/18] Add $offset parameter to rhythm() function. --- .../stylesheets/compass/typography/_vertical_rhythm.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss index accdfe21..999d1fb3 100644 --- a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +++ b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss @@ -111,12 +111,13 @@ $base-half-leader: $base-leader / 2; // Calculate rhythm units. @function rhythm( $lines: 1, - $font-size: $base-font-size + $font-size: $base-font-size, + $offset: 0 ) { @if not $relative-font-sizing and $font-size != $base-font-size { @warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function"; } - $rhythm: $font-unit * $lines * $base-line-height / $font-size; + $rhythm: $font-unit * ($lines * $base-line-height - $offset) / $font-size; // Round the pixels down to nearest integer. @if unit($rhythm) == px { $rhythm: floor($rhythm); @@ -183,7 +184,7 @@ $base-half-leader: $base-leader / 2; style: $border-style; width: $font-unit * $width / $font-size; }; - padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width); + padding-#{$side}: rhythm($lines, $font-size, $offset: $width); } // Apply borders and whitespace equally to all sides. @@ -195,7 +196,7 @@ $base-half-leader: $base-leader / 2; style: $border-style; width: $font-unit * $width / $font-size; }; - padding: $font-unit / $font-size * ($lines * $base-line-height - $width); + padding: rhythm($lines, $font-size, $offset: $width); } // Apply a leading border. From bfb2ebe88be7cc6ba44cfe84ddbeaaebede79572 Mon Sep 17 00:00:00 2001 From: Matt Farmer Date: Thu, 19 Apr 2012 15:47:27 -0400 Subject: [PATCH 16/18] 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 { From 5c44dda6adb0c38f0265f9a0ca2a782e8087c072 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Fri, 27 Apr 2012 08:13:08 -0700 Subject: [PATCH 17/18] Compass.app costs $10 now. --- doc-src/content/index.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-src/content/index.haml b/doc-src/content/index.haml index daab61a0..887e654f 100644 --- a/doc-src/content/index.haml +++ b/doc-src/content/index.haml @@ -91,7 +91,7 @@ layout: homepage %img(src="/images/compass.app.png") %p Buy Compass.app - for Windows and Mac for just $7. + for Windows and Mac for just $10. %p.note Note: Compass.app is a product of Handlino, Inc but 30% of all proceeds go to Compass's charity of choice: UMDF.org. From 4d3448c673b4a32241567d9b85227fe24f4aab90 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 27 Apr 2012 15:45:30 -0600 Subject: [PATCH 18/18] +has-layout-zoom ignores $legacy-support-for-ie8 (*hack doesn't effect IE8 anyway) --- .../compass/stylesheets/compass/utilities/general/_hacks.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss b/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss index 4a4cc828..d5a6baea 100644 --- a/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss +++ b/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss @@ -22,7 +22,7 @@ $default-has-layout-approach: zoom !default; } @mixin has-layout-zoom { - @if $legacy-support-for-ie { + @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { *zoom: 1; } }