merge stable into master

doc-src/content/CHANGELOG.markdown

@@ -33,6 +33,7 @@ The Documentation for the [latest preview release](http://beta.compass-style.org
   vertical rhythm module work better with `rem` based measurements.
 * [CSS3] Added 3D transform support for Mozillia, IE, and Opera.
 * [CSS3] Added `-ms` support for css3 columns. Add support for the columns shorthand property.
+* [CSS3] Added `-ms` and `-webkit` support for CSS Regions. [Docs](/reference/compass/css3/regions/)
 * [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

doc-src/content/examples/compass/css3/regions.haml

@@ -0,0 +1,8 @@
+---
+title: CSS Regions
+description: css3 mixin for css regions
+framework: compass
+stylesheet: compass/css3/_regions.scss
+example: true
+---
+= render "partials/example"

doc-src/content/examples/compass/css3/regions/markup.haml

@@ -0,0 +1,7 @@
+.source
+  %p
+    This is the source material
+
+.new-container
+  %p
+    This is the target location

doc-src/content/examples/compass/css3/regions/stylesheet.sass

@@ -0,0 +1,13 @@
+@import compass/css3
+
+.source   
+  +flow-into(target)
+  border: 10px solid green
+  margin: 20px
+  width: 200px
+
+.new-container 
+  +flow-from(target)
+  border: 10px solid red
+  margin: 20px
+  width: 200px

doc-src/content/reference/compass/css3/regions.haml

@@ -0,0 +1,15 @@
+--- 
+title: Compass CSS Regions
+crumb: CSS Regions
+framework: compass
+stylesheet: compass/css3/_regions.scss
+meta_description: Specify CSS Regions for supported browsers.
+layout: core
+classnames:
+  - reference
+  - core
+  - css3
+---
+- render 'reference' do
+  %p
+    Provides two mixins for CSS regions, properties which allow you to flow content into new containers. See <a href="http://dev.w3.org/csswg/css3-regions/">the spec draft</a> and <a href="http://labs.adobe.com/technologies/cssregions/">Adobe's page on the topic</a>. 

frameworks/compass/stylesheets/compass/_css3.scss

@@ -15,3 +15,4 @@
 @import "css3/transition";
 @import "css3/appearance";
 @import "css3/animation";
+@import "css3/regions";

frameworks/compass/stylesheets/compass/css3/_regions.scss

@@ -0,0 +1,22 @@
+@import "shared";
+
+// Webkit, IE10 and future support for [CSS Regions](http://dev.w3.org/csswg/css3-regions/)
+//
+// $target is a value you use to link two regions of your css. Give the source of your content the flow-into property, and give your target container the flow-from property.
+//
+// For a visual explanation, see the diagrams at Chris Coyier's
+// [CSS-Tricks](http://css-tricks.com/content-folding/)
+
+@mixin flow-into($target) {
+  $target: unquote($target);
+  @include experimental(flow-into, $target,
+    not -moz, -webkit, not -o, -ms, not -khtml, not official
+  );
+}
+
+@mixin flow-from($target) {
+  $target: unquote($target);
+  @include experimental(flow-from, $target,
+    not -moz, -webkit, not -o, -ms, not -khtml, not official
+  );
+}

frameworks/compass/stylesheets/compass/reset/_utilities.scss

@@ -17,7 +17,9 @@
   time, mark, audio, video {
     @include reset-box-model;
     @include reset-font; }
-  body {
+  // Unlike Eric's original reset, we reset the html element to be compatible
+  // with the vertical rhythm mixins.
+  html {
     @include reset-body; }
   ol, ul {
     @include reset-list-style; }

test/fixtures/stylesheets/compass/css/regions.css

@@ -0,0 +1,7 @@
+.source {
+  -webkit-flow-into: target;
+  -ms-flow-into: target; }
+
+.new-container {
+  -webkit-flow-from: target;
+  -ms-flow-from: target; }

test/fixtures/stylesheets/compass/css/reset.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 {

test/fixtures/stylesheets/compass/sass/regions.scss

@@ -0,0 +1,4 @@
+@import "compass/css3/regions";
+
+.source   { @include flow-into(target); }
+.new-container { @include flow-from(target); }