From 34e9feae73e69565242d5cbceae497a636640cf6 Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Tue, 31 Aug 2010 22:36:50 -0700 Subject: [PATCH 01/14] Some doc modifications. --- doc-src/content/reference/blueprint.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc-src/content/reference/blueprint.haml b/doc-src/content/reference/blueprint.haml index 51c38007..5a4a1a3d 100644 --- a/doc-src/content/reference/blueprint.haml +++ b/doc-src/content/reference/blueprint.haml @@ -34,10 +34,10 @@ meta_description: The Blueprint Framework -- ported to Sass. ### Alternate Project Layouts For any of the above commands you could have also selected - the `blueprint/basic` or `blueprint/semantic`. The basic - template assumes that you'll be starting using conventional - blueprint styling techniques while the semantic template - assumes that you'll be using mixins and inheritance to style + the `blueprint/basic` or `blueprint/semantic` patterns. The basic + pattern assumes that you'll start out using conventional class-based + blueprint styling techniques, while the semantic template + assumes that you'll be using mixins and `@extend` to style your site. Example: compass create my_project --using blueprint/semantic From 62c78d95450117855b26be984165e02f73854799 Mon Sep 17 00:00:00 2001 From: Dylan Paris Date: Tue, 21 Sep 2010 19:08:24 -0700 Subject: [PATCH 02/14] Added @charset declaration to force UTF-8 encoding on systems with different default encodings --- frameworks/compass/stylesheets/compass/css3/_font-face.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/compass/stylesheets/compass/css3/_font-face.scss b/frameworks/compass/stylesheets/compass/css3/_font-face.scss index 7c9030b0..292f8893 100644 --- a/frameworks/compass/stylesheets/compass/css3/_font-face.scss +++ b/frameworks/compass/stylesheets/compass/css3/_font-face.scss @@ -1,3 +1,4 @@ +@charset "UTF-8"; @import "shared"; // Cross-browser support for @font-face. Supports IE, Gecko, Webkit, Opera. From 2ff13efce1b036f0314b602da9e82052506a447a Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 24 Sep 2010 16:52:37 -0600 Subject: [PATCH 03/14] HTML5 reset includes box-model reset for newer browsers. --- frameworks/compass/stylesheets/compass/reset/_utilities.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/compass/stylesheets/compass/reset/_utilities.scss b/frameworks/compass/stylesheets/compass/reset/_utilities.scss index d9ba6d9c..268e0f9f 100644 --- a/frameworks/compass/stylesheets/compass/reset/_utilities.scss +++ b/frameworks/compass/stylesheets/compass/reset/_utilities.scss @@ -102,9 +102,11 @@ // Unrecognized elements are displayed inline. // This reset provides a basic reset for html5 elements -// so they are rendered correctly in browsers that don't recognize them. +// so they are rendered correctly in browsers that don't recognize them +// and reset in browsers that have default styles for them. @mixin reset-html5 { article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { + @include reset-box-model; display: block; } } // Resets the display of inline and block elements to their default display From 04141c62e21f066a50f51bef8f9b247dbc5c81f7 Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Fri, 1 Oct 2010 06:02:04 -0700 Subject: [PATCH 04/14] Fixed typo. --- lib/compass/app_integration/rails/installer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/app_integration/rails/installer.rb b/lib/compass/app_integration/rails/installer.rb index 2c6682a1..e3c7d110 100644 --- a/lib/compass/app_integration/rails/installer.rb +++ b/lib/compass/app_integration/rails/installer.rb @@ -38,7 +38,7 @@ module Compass Congratulations! Your rails project has been configured to use Compass. Just one more thing left to do: Register the compass gem. -In Rails 2.2 & 2.3, add the following to your evironment.rb: +In Rails 2.2 & 2.3, add the following to your environment.rb: config.gem "compass", :version => ">= #{Compass::VERSION}" From 12f4bc7a06f546ad817d1c9c9f3275c5192cec13 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 9 Oct 2010 13:25:14 -0700 Subject: [PATCH 05/14] Turns out that IE6 & 7 don't support this. --- .../reference/compass/utilities/links/unstyled_link.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-src/content/reference/compass/utilities/links/unstyled_link.haml b/doc-src/content/reference/compass/utilities/links/unstyled_link.haml index 4e223326..d23e4d93 100644 --- a/doc-src/content/reference/compass/utilities/links/unstyled_link.haml +++ b/doc-src/content/reference/compass/utilities/links/unstyled_link.haml @@ -13,4 +13,4 @@ classnames: --- - render 'reference' do %p - Makes a link appear like regular text. + Makes a link appear like regular text. Not supported by IE 6 or 7. From 794703fbc4f0799f620969eb8d9eb8b5c070b310 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 9 Oct 2010 13:27:48 -0700 Subject: [PATCH 06/14] Make it easier to disable the asset cache buster. --- .../tutorials/configuration-reference.markdown | 4 ++++ lib/compass/configuration/data.rb | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc-src/content/tutorials/configuration-reference.markdown b/doc-src/content/tutorials/configuration-reference.markdown index d62b89b7..ff6807d2 100644 --- a/doc-src/content/tutorials/configuration-reference.markdown +++ b/doc-src/content/tutorials/configuration-reference.markdown @@ -260,3 +260,7 @@ that points to the asset on disk — which may or may not exist. "v=#{deploy_version}" end end + +To disable the asset cache buster: + + asset_cache_buster :none diff --git a/lib/compass/configuration/data.rb b/lib/compass/configuration/data.rb index 8ae6afa2..c2f88dd0 100644 --- a/lib/compass/configuration/data.rb +++ b/lib/compass/configuration/data.rb @@ -77,9 +77,19 @@ module Compass # If the block accepts two arguments, it will also be passed a File object # that points to the asset on disk -- which may or may not exist. # When called without a block, returns the block that was previously set. - def asset_cache_buster(&block) + # + # To disable the asset cache buster: + # + # asset_cache_buster :none + def asset_cache_buster(simple = nil, &block) if block_given? @asset_cache_buster = block + elsif !simple.nil? + if simple == :none + @asset_cache_buster = Proc.new {|_,_| nil} + else + raise ArgumentError, "Unexpected argument: #{simple.inspect}" + end else if @asset_cache_buster @asset_cache_buster From 08f9f47c43cf9cfcb997642a6bc43bd8bda7fad1 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 01:13:07 -0700 Subject: [PATCH 07/14] update changelog --- doc-src/content/CHANGELOG.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index 3c6418c0..5e587f5b 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -7,6 +7,13 @@ layout: article COMPASS CHANGELOG ================= +0.10.6 (10/11/2010) +------------------- + +* HTML5 reset includes box-model reset for newer browsers. +* Fix encoding issue for ruby 1.9 users of the font-face mixin. +* Make it easier to disable the asset cache buster: `asset_cache_buster :none` + 0.10.5 (08/29/2010) ------------------- From 4820676d3a69ffe03ed3b8216ae5c38442a802c6 Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Tue, 14 Sep 2010 16:20:24 -0700 Subject: [PATCH 08/14] rake examples was getting a non-existent branch. Default to master. --- examples/susy/bootstrap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/susy/bootstrap.rb b/examples/susy/bootstrap.rb index 4689ec3f..d28f73f3 100644 --- a/examples/susy/bootstrap.rb +++ b/examples/susy/bootstrap.rb @@ -1,3 +1,3 @@ require File.join(File.dirname(__FILE__), '..', 'downloader') -install_from_github('ericam', 'compass-susy-plugin', 'susy', 'edge') +install_from_github('ericam', 'compass-susy-plugin', 'susy') From af72d2251f89da0b1d7b3203d213a605c106aa0c Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Tue, 14 Sep 2010 17:31:19 -0700 Subject: [PATCH 09/14] Option for horizontal-list to skip padding. --- doc-src/content/CHANGELOG.markdown | 2 ++ .../utilities/lists/_horizontal-list.scss | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index 5e587f5b..8a1d9eff 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -13,6 +13,8 @@ COMPASS CHANGELOG * HTML5 reset includes box-model reset for newer browsers. * Fix encoding issue for ruby 1.9 users of the font-face mixin. * Make it easier to disable the asset cache buster: `asset_cache_buster :none` +* Can now set `$padding` to `false` to make the `horizontal-list` mixin skip the + padding properties. 0.10.5 (08/29/2010) ------------------- diff --git a/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss b/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss index 5e98b718..297e895a 100644 --- a/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss +++ b/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss @@ -31,21 +31,26 @@ // // :last-child is not fully supported // see http://www.quirksmode.org/css/contents.html#t29 for the support matrix - +// +// Setting `$padding` to `false` disables the padding between list elements @mixin horizontal-list-item($padding: 4px, $direction: left) { @include no-bullet; white-space: nowrap; @include float($direction); - padding: { - left: $padding; - right: $padding; - }; - &:first-child, &.first { padding-#{$direction}: 0px; } - &:last-child, &.last { padding-#{opposite-position($direction)}: 0px; } + @if $padding { + padding: { + left: $padding; + right: $padding; + } + &:first-child, &.first { padding-#{$direction}: 0; } + &:last-child, &.last { padding-#{opposite-position($direction)}: 0; } + } } // A list(ol,ul) that is layed out such that the elements are floated left and won't wrap. // This is not an inline list. +// +// Setting `$padding` to `false` disables the padding between list elements @mixin horizontal-list($padding: 4px, $direction: left) { @include horizontal-list-container; li { From 0a072112868095d1c0113ebeb54896b63e31777e Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 01:51:19 -0700 Subject: [PATCH 10/14] fix some gem issues --- Gemfile | 3 ++- test/fixtures/stylesheets/compass/css/lists.css | 15 +++++++++++++++ test/fixtures/stylesheets/compass/sass/lists.scss | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c78185e8..51a54aea 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,6 @@ gem "compass", :path => "." gem "cucumber" gem "rspec" gem "rails", "~>3.0.0.rc" -gem "compass-validator" +gem "compass-validator", "1.0.0" gem "css_parser" +gem "rcov" diff --git a/test/fixtures/stylesheets/compass/css/lists.css b/test/fixtures/stylesheets/compass/css/lists.css index d4d6a68c..1f3c8de2 100644 --- a/test/fixtures/stylesheets/compass/css/lists.css +++ b/test/fixtures/stylesheets/compass/css/lists.css @@ -61,6 +61,21 @@ ul.right-horizontal { ul.right-horizontal li:last-child, ul.right-horizontal li.last { padding-left: 0px; } +ul.right-horizontal { + margin: 0; + padding: 0; + border: 0; + outline: 0; + overflow: hidden; + *zoom: 1; } + ul.right-horizontal li { + list-style-image: none; + list-style-type: none; + margin-left: 0px; + white-space: nowrap; + display: inline; + float: right; } + ul.inline-block { margin: 0; padding: 0; diff --git a/test/fixtures/stylesheets/compass/sass/lists.scss b/test/fixtures/stylesheets/compass/sass/lists.scss index bdbc3788..395e879a 100644 --- a/test/fixtures/stylesheets/compass/sass/lists.scss +++ b/test/fixtures/stylesheets/compass/sass/lists.scss @@ -3,6 +3,7 @@ ul.horizontal { @include horizontal-list; } ul.wide-horizontal { @include horizontal-list(10px); } ul.right-horizontal { @include horizontal-list(4px, right); } +ul.no-padding { @include horizontal-list(false); } ul.inline-block { @include inline-block-list; } ul.wide-inline-block { @include inline-block-list(10px); } ul.inline { @include inline-list; } From 03ebd5dd985590091b0135b30cef582ad4115004 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 01:51:53 -0700 Subject: [PATCH 11/14] Fix test failure in ruby 1.9.2 --- test/fixtures/stylesheets/image_urls/config.rb | 4 +++- test/fixtures/stylesheets/image_urls/css/screen.css | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/fixtures/stylesheets/image_urls/config.rb b/test/fixtures/stylesheets/image_urls/config.rb index c3381dac..bcdae437 100644 --- a/test/fixtures/stylesheets/image_urls/config.rb +++ b/test/fixtures/stylesheets/image_urls/config.rb @@ -7,11 +7,13 @@ output_style = :compact # To enable relative image paths using the images_url() function: # http_images_path = :relative http_images_path = "/images" +line_comments = false asset_cache_buster do |path, file| "busted=true" end + asset_host do |path| - "http://assets%d.example.com" % (path.hash % 4) + "http://assets%d.example.com" % (path.size % 4) end diff --git a/test/fixtures/stylesheets/image_urls/css/screen.css b/test/fixtures/stylesheets/image_urls/css/screen.css index c7de0c65..9609ab2c 100644 --- a/test/fixtures/stylesheets/image_urls/css/screen.css +++ b/test/fixtures/stylesheets/image_urls/css/screen.css @@ -1,3 +1,3 @@ -.showgrid { background-image: url('http://assets2.example.com/images/grid.png?busted=true'); } +.showgrid { background-image: url('http://assets0.example.com/images/grid.png?busted=true'); } .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); } From 11b36a3831652317be64e2ac3a584c3c12c44a00 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 01:58:20 -0700 Subject: [PATCH 12/14] Update tests for charset changes. --- test/fixtures/stylesheets/compass/css/box.css | 1 + test/fixtures/stylesheets/compass/css/fonts.css | 1 + test/fixtures/stylesheets/compass/css/gradients.css | 1 + 3 files changed, 3 insertions(+) diff --git a/test/fixtures/stylesheets/compass/css/box.css b/test/fixtures/stylesheets/compass/css/box.css index 795c795e..cd8ee5e1 100644 --- a/test/fixtures/stylesheets/compass/css/box.css +++ b/test/fixtures/stylesheets/compass/css/box.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; .hbox { display: -moz-box; display: -webkit-box; diff --git a/test/fixtures/stylesheets/compass/css/fonts.css b/test/fixtures/stylesheets/compass/css/fonts.css index 596b9a06..01d9dcbf 100644 --- a/test/fixtures/stylesheets/compass/css/fonts.css +++ b/test/fixtures/stylesheets/compass/css/fonts.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; @font-face { font-family: "font1"; src: local("☺"), url('/tmp/fonts/font1.woff') format('woff'); } diff --git a/test/fixtures/stylesheets/compass/css/gradients.css b/test/fixtures/stylesheets/compass/css/gradients.css index 2ac003fd..763fb7fa 100644 --- a/test/fixtures/stylesheets/compass/css/gradients.css +++ b/test/fixtures/stylesheets/compass/css/gradients.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; .linear-1 { background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa)); background-image: -moz-linear-gradient(top, #dddddd 0%, #aaaaaa 100%); From 8998dddbf8dcd53b83b4a47480214242e8f5d820 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 01:59:45 -0700 Subject: [PATCH 13/14] tests for padding free horizontal list. --- .../fixtures/stylesheets/compass/css/lists.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/fixtures/stylesheets/compass/css/lists.css b/test/fixtures/stylesheets/compass/css/lists.css index 1f3c8de2..21f53633 100644 --- a/test/fixtures/stylesheets/compass/css/lists.css +++ b/test/fixtures/stylesheets/compass/css/lists.css @@ -15,9 +15,9 @@ ul.horizontal { padding-left: 4px; padding-right: 4px; } ul.horizontal li:first-child, ul.horizontal li.first { - padding-left: 0px; } + padding-left: 0; } ul.horizontal li:last-child, ul.horizontal li.last { - padding-right: 0px; } + padding-right: 0; } ul.wide-horizontal { margin: 0; @@ -36,9 +36,9 @@ ul.wide-horizontal { padding-left: 10px; padding-right: 10px; } ul.wide-horizontal li:first-child, ul.wide-horizontal li.first { - padding-left: 0px; } + padding-left: 0; } ul.wide-horizontal li:last-child, ul.wide-horizontal li.last { - padding-right: 0px; } + padding-right: 0; } ul.right-horizontal { margin: 0; @@ -57,24 +57,24 @@ ul.right-horizontal { padding-left: 4px; padding-right: 4px; } ul.right-horizontal li:first-child, ul.right-horizontal li.first { - padding-right: 0px; } + padding-right: 0; } ul.right-horizontal li:last-child, ul.right-horizontal li.last { - padding-left: 0px; } + padding-left: 0; } -ul.right-horizontal { +ul.no-padding { margin: 0; padding: 0; border: 0; outline: 0; overflow: hidden; *zoom: 1; } - ul.right-horizontal li { + ul.no-padding li { list-style-image: none; list-style-type: none; margin-left: 0px; white-space: nowrap; display: inline; - float: right; } + float: left; } ul.inline-block { margin: 0; From d5e4ba7533be8b9797d66c929124266a26ef50fd Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 11 Oct 2010 02:13:33 -0700 Subject: [PATCH 14/14] Fix broken test. --- features/command_line.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/features/command_line.feature b/features/command_line.feature index 5ce32ad7..2aa40397 100644 --- a/features/command_line.feature +++ b/features/command_line.feature @@ -182,6 +182,7 @@ Feature: Command Line | install | | interactive | | stats | + | unpack | | validate | | version |