Permalink
Browse files

Merge branch 'stable' of github.com:chriseppstein/compass into stable

  • Loading branch information...
scottdavis committed Jun 12, 2011
2 parents 6bb9904 + 2d81e0a commit 6712c65ce77271e65f880db90da4444a20a27bf6
@@ -19,6 +19,9 @@ The Documentation for the [latest preview release](http://beta.compass-style.org
**Note:** Due to some internal changes to compass you may have issue with your sass cache. Run `compass clean` to clear your cache.
+* The `pie-clearfix` mixin has been updated. If you have to
+ support Firefox < 3.5, please update your stylesheets
+ to use `legacy-pie-clearfix` instead.
* Added a new command: `compass clean` which removes any generated
css files and clears the sass cache.
* Enable IE 10 support for flexible box with the -ms prefix.
@@ -32,7 +35,7 @@ The Documentation for the [latest preview release](http://beta.compass-style.org
* Numerous small bug fixes to sprites.
* Sprite Engines are now classes see [Docs](/help/tutorials/extending) for more information
* Sprite classes have bee re-factored into modules for readability
-* Sprites will no longer cause `undefined method 'find' for #<Compass::SpriteMap` when adding or removing sprite files
+* Sprites will no longer cause `undefined method 'find' for #<Compass::SpriteMap>` when adding or removing sprite files
0.11.2 (06/10/2011)
-------------------
@@ -18,7 +18,7 @@
// [Easy Clearing](http://www.positioniseverything.net/easyclearing.html)
// has the advantage of allowing positioned elements to hang
// outside the bounds of the container at the expense of more tricky CSS.
-@mixin pie-clearfix {
+@mixin legacy-pie-clearfix {
&:after {
content : "\0020";
display : block;
@@ -30,14 +30,14 @@
@include has-layout;
}
-// An update to the PIE clearfix method that reduces the amount of CSS required
-// [A new micro clearfix hack](http://nicolasgallagher.com/micro-clearfix-hack/) (25 April 2011)
-@mixin micro-clearfix {
- &:before, &:after {
+// This is an updated version of the PIE clearfix method that reduces the amount of CSS output.
+// If you need to support Firefox before 3.5 you need to use `legacy-pie-clearfix` instead.
+//
+// Adapted from: [A new micro clearfix hack](http://nicolasgallagher.com/micro-clearfix-hack/)
+@mixin pie-clearfix {
+ &:after {
content: "";
display: table;
- }
- &:after {
clear: both;
}
@include has-layout;
View
@@ -84,7 +84,7 @@ def clean!
def run
if new_config?
# Wipe out the cache and force compilation if the configuration has changed.
- FileUtils.rm_rf options[:cache_location]
+ remove options[:cache_location]
options[:force] = true
end
@@ -15,3 +15,12 @@
visibility: hidden; }
.pie-clearfix {
display: block; }
+
+.simplified-pie-clearfix {
+ display: inline-block; }
+ .simplified-pie-clearfix:after {
+ content: "";
+ display: table;
+ clear: both; }
+ .simplified-pie-clearfix {
+ display: block; }
@@ -12,6 +12,13 @@
overflow: hidden;
visibility: hidden; }
+.simple-pie-clearfix {
+ *zoom: 1; }
+ .simple-pie-clearfix:after {
+ content: "";
+ display: table;
+ clear: both; }
+
p.light {
background-color: #b0201e;
color: black; }
@@ -7,5 +7,8 @@ $default-has-layout-approach: block;
}
.pie-clearfix {
+ @include legacy-pie-clearfix;
+}
+.simplified-pie-clearfix {
@include pie-clearfix;
}
@@ -5,7 +5,10 @@
}
.pie-clearfix {
- @include pie-clearfix;
+ @include legacy-pie-clearfix;
+}
+.simple-pie-clearfix {
+ @include pie-clearfix;
}
p.light { @include contrasted(#B0201E); }

0 comments on commit 6712c65

Please sign in to comment.