compass 0.10.6 → 0.11.alpha.0

data/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss

@@ -15,19 +15,17 @@
 //   +blueprint-scaffolding("body#page-1, body#page-2, body.a-special-page-type")
 //   Alternatively, you can use the +blueprint-scaffolding-body and +blueprint-scaffolding-defaults
 //   mixins to construct your own semantic style rules.
-
-@mixin blueprint-scaffolding($body_selector: body) {
-  @if $body_selector != body {
-    #{$body_selector} {
-      @include blueprint-scaffolding-defaults;
-    }
-  } @else {
-    @include blueprint-scaffolding-defaults;
+// @deprecated It is no longer necessary to pass any argument.
+@mixin blueprint-scaffolding($nested: deprecated) {
+  @if $nested != deprecated {
+    @warn "It is no longer necessary to pass any argument to the blueprint-scaffolding mixin."
   }
+  @include blueprint-scaffolding-defaults;
 }
 
-// The styles this mixin provides were deprecated in Blueprint 0.9 and is no longer part of the
-// main scaffolding, but the mixin is still available if you want to use it.
+// The styles this mixin provides were deprecated in Blueprint 0.9 and is no
+// longer part of the main scaffolding, but the mixin is still available if
+// you want to use it.
 @mixin blueprint-scaffolding-body {
   margin: 1.5em 0; }
 
@@ -41,10 +39,10 @@
   .box {
     @include box; }
   // Border on right hand side of a column. You can comment this out if you don't plan to use it.
-  div.border {
+  .border {
     @include border; }
   // Border with more whitespace, spans one column.
-  div.colborder {
+  .colborder {
     @include colborder; }
   hr {
     @include colruler; }

data/frameworks/blueprint/stylesheets/blueprint/_typography.scss

@@ -25,27 +25,13 @@ $blueprint-font-size: 12px !default;
 // body#page-1, body#page-2, body.a-special-page-type
 //   +blueprint-typography(true)
 // </pre>
-//
-// **Deprecated**:
-// You can pass the body selector as the first argument when used as a top-level mixin
-// <pre class="source-code sass">
-// +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
-// </pre>
-@mixin blueprint-typography($body-selector: body) {
-  @if $body-selector == true {
+@mixin blueprint-typography($nested: false) {
+  @if $nested {
     @include blueprint-typography-body;
     @include blueprint-typography-defaults;
   } @else {
-    #{$body-selector} {
-      @include blueprint-typography-body;
-      @if $body-selector != body {
-        @warn "[DEPRECATED] To specify the selector \"#{$body-selector}\" to +blueprint-typography, pass true as the first argument and mix it into #{$body-selector}.";
-        @include blueprint-typography-defaults;
-      }
-    }
-    @if $body-selector == body {
-      @include blueprint-typography-defaults;
-    }
+    body { @include blueprint-typography-body; }
+    @include blueprint-typography-defaults;
   }
 }
 
@@ -63,42 +49,42 @@ $blueprint-font-size: 12px !default;
 
 @mixin blueprint-typography-defaults {
   #{headers(all)} { @include header-text;
-    img             { margin: 0; } }
+    img           { margin: 0; } }
   h1              { font-size: 3em;   line-height: 1;    margin-bottom: 0.50em; }
   h2              { font-size: 2em;                      margin-bottom: 0.75em; }
   h3              { font-size: 1.5em; line-height: 1;    margin-bottom: 1.00em; }
   h4              { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
   h5              { font-size: 1em;   font-weight: bold; margin-bottom: 1.50em; }
   h6              { font-size: 1em;   font-weight: bold;                        }
-  p               { margin: 0 0 1.5em;
-    img.left        { @include float-left;  margin: 1.5em 1.5em 1.5em 0; padding: 0; }
-    img.right       { @include float-right; margin: 1.5em 0 1.5em 1.5em; padding: 0; }
-                  }
+  p               { margin: 0 0 1.5em; 
+    .left         { @include float-left;  margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+    .right        { @include float-right; margin: 1.5em 0 1.5em 1.5em; padding: 0; } }
   a               { text-decoration: underline; @include link-colors($link-color, $link-hover-color, $link-active-color, $link-visited-color, $link-focus-color); }
-  blockquote      { margin: 1.5em; color: $alt_text_color; font-style: italic; }
-  strong          { font-weight: bold; }
-  em              { font-style: italic; }
-  dfn             { font-style: italic; font-weight: bold; }
+  blockquote      { margin: 1.5em; color: $alt-text-color; font-style: italic; }
+  strong, dfn     { font-weight: bold; }
+  em, dfn         { font-style: italic; }
   sup, sub        { line-height: 0; }
   abbr, acronym   { border-bottom: 1px dotted #666666; }
   address         { margin: 0 0 1.5em; font-style: italic; }
-  del             { color: $alt_text_color; }
+  del             { color: $alt-text-color; }
   pre             { margin: 1.5em 0; white-space: pre; }
   pre, code, tt   { @include fixed-width-text; }
   li ul, li ol    { margin: 0; }
-  ul, ol          { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; }
+  ul, ol          { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; }
   ul              { list-style-type: disc; }
   ol              { list-style-type: decimal; }
   dl              { margin: 0 0 1.5em 0;
-    dt              { font-weight: bold; } }
+    dt            { font-weight: bold; } }
   dd              { margin-left: 1.5em; }
   table           { margin-bottom: 1.4em; width: 100%; }
   th              { font-weight: bold; }
   thead th        { background: $blueprint-table-header-color; }
   th, td, caption { padding: 4px 10px 4px 5px; }
-  tr.even td      { background: $blueprint-table-stripe-color; }
+  table.striped tr:nth-child(even) td,
+  table         tr.even            td
+                  { background: $blueprint-table-stripe-color; }
   tfoot           { font-style: italic; }
-  caption         { background: $blueprint_background_color; }
+  caption         { background: $blueprint-background-color; }
   .quiet          { @include quiet; }
   .loud           { @include loud; }
 }

data/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss

@@ -1,58 +1,83 @@
 // Global reset rules.
 // For more specific resets, use the reset mixins provided below
 @mixin blueprint-global-reset {
-  html, body {
-    @include blueprint-reset; }
-  html {
-    font-size: 100.01%; }
+  html { @include blueprint-reset-box-model; }
+  body { @extend .bp-reset-element; }
   @include blueprint-nested-reset; }
 
 // Reset all elements within some selector scope.To reset the selector itself,
 // mixin the appropriate reset mixin for that element type as well. This could be
 // useful if you want to style a part of your page in a dramatically different way.
 @mixin blueprint-nested-reset {
-  div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
-  pre, a, abbr, acronym, address, code, del, dfn, em, img,
-  dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr {
-    @include blueprint-reset; }
-  blockquote, q {
-    @include blueprint-reset-quotation; }
-  th, td, caption {
-    @include blueprint-reset-table-cell; }
-  table {
-    @include blueprint-reset-table; }
-  a img {
-    border: none; } }
+  .bp-reset-element,
+  div, span, object, iframe, p,
+  pre, a, abbr, acronym, address,
+  code, del, dfn, em, img,
+  dl, dt, dd, ol, ul, li, fieldset,
+  form, label, legend,
+  caption, tbody, tfoot, thead, tr { @include blueprint-basic-reset;                           }
+  #{headers(all)}                  { @include blueprint-basic-reset(bp-reset-element);         }
+  #{elements-of-type(html5)}       { @include blueprint-reset-html5-element(bp-reset-element); }
+  blockquote, q                    { @include blueprint-reset-quotation(bp-reset-element);     }
+  th, td, caption                  { @include blueprint-reset-table-cell(bp-reset-element);    }
+  table                            { @include blueprint-reset-table(bp-reset-element);         }
+  a img                            { border: none;                                             }
+}
+
+@mixin blueprint-reset-html5-element($reset-base-class: false) {
+  @if $reset-base-class { @extend .#{$reset-base-class}; }
+  @else                 { @include blueprint-reset; }
+  display: block;
+}
 
 @mixin blueprint-reset-box-model {
   margin: 0;
   padding: 0;
-  border: 0; }
+  border: 0;
+}
 
 @mixin blueprint-reset {
-  @include blueprint-reset-box-model;
+  @warn "The blueprint-reset mixin is deprecated. Please use blueprint-basic-reset instead.";
+  @include blueprint-basic-reset;
+}
+
+@mixin blueprint-basic-reset($reset-base-class: false) {
+  @if $reset-base-class {
+    @extend .#{$reset-base-class};
+  } @else {
+    @include blueprint-reset-box-model;
+    @include blueprint-reset-typography;
+  }
+}
+
+@mixin blueprint-reset-typography {
   font: {
     weight: inherit;
     style: inherit;
     size: 100%;
     family: inherit; };
-  vertical-align: baseline; }
+  vertical-align: baseline;
+}
 
-@mixin blueprint-reset-quotation {
-  @include blueprint-reset;
+@mixin blueprint-reset-quotation($reset-base-class: false) {
+  @if $reset-base-class { @extend .#{$reset-base-class}; }
+  @else { @include blueprint-reset; }
   quotes: "" "";
   &:before,
   &:after {
     content: ""; } }
 
-@mixin blueprint-reset-table-cell {
-  @include blueprint-reset;
+@mixin blueprint-reset-table-cell($reset-base-class: false) {
+  @if $reset-base-class { @extend .#{$reset-base-class}; }
+  @else { @include blueprint-reset; }
+  float: none !important;
   text-align: left;
   font-weight: normal;
   vertical-align: middle; }
 
-@mixin blueprint-reset-table {
-  @include blueprint-reset;
+@mixin blueprint-reset-table($reset-base-class: false) {
+  @if $reset-base-class { @extend .#{$reset-base-class}; }
+  @else { @include blueprint-reset; }
   border-collapse: separate;
   border-spacing: 0;
   vertical-align: middle; }

data/frameworks/compass/stylesheets/compass/_css3.scss

@@ -1,15 +1 @@
-@import "css3/border-radius";
-@import "css3/inline-block";
-@import "css3/opacity";
-@import "css3/box-shadow";
-@import "css3/text-shadow";
-@import "css3/columns";
-@import "css3/box-sizing";
-@import "css3/box";
-@import "css3/gradient";
-@import "css3/background-clip";
-@import "css3/background-origin";
-@import "css3/background-size";
-@import "css3/font-face";
-@import "css3/transform";
-@import "css3/transition";
+@import "css3/version-1";

data/frameworks/compass/stylesheets/compass/_layout.scss

@@ -1 +1,2 @@
 @import "layout/sticky-footer";
+@import "layout/stretching";

data/frameworks/compass/stylesheets/compass/_support.scss

@@ -23,3 +23,7 @@ $experimental-support-for-opera     : true !default;
 $experimental-support-for-microsoft : true !default;
 // Support for khtml in experimental css3 properties.
 $experimental-support-for-khtml     : true !default;
+// Support for svg in experimental css3 properties.
+// Setting this to true might add significant size to your
+// generated stylesheets.
+$experimental-support-for-svg     : false !default;

data/frameworks/compass/stylesheets/compass/css3/_box-shadow-v2.scss

@@ -0,0 +1,98 @@
+// @doc off
+// These defaults make the arguments optional for this mixin
+// If you like, set different defaults before importing.
+// @doc on
+
+@import "shared";
+
+
+// The default color for box shadows
+$default-box-shadow-color: #333333 !default;
+
+// The default horizontal offset. Positive is to the right.
+$default-box-shadow-h-offset: 0px !default;
+
+// The default vertical offset. Positive is down.
+$default-box-shadow-v-offset: 0px !default;
+
+// The default blur length.
+$default-box-shadow-blur: 5px !default;
+
+// The default spread length.
+$default-box-shadow-spread : false !default;
+
+// The default shadow instet: inset or false (for standard shadow).
+$default-box-shadow-inset : false !default;
+
+// Provides cross-browser CSS box shadows for Webkit, Gecko, and CSS3.
+// Arguments are color, horizontal offset, vertical offset, blur length, spread length, and inset.
+@mixin single-box-shadow(
+  $color  : $default-box-shadow-color,
+  $hoff   : $default-box-shadow-h-offset,
+  $voff   : $default-box-shadow-v-offset,
+  $blur   : $default-box-shadow-blur,
+  $spread : $default-box-shadow-spread,
+  $inset  : $default-box-shadow-inset
+) {
+  @if not ($inset == true or $inset == false or $inset == inset) {
+    @warn "$inset expected to be true or the inset keyword. Got #{$inset} instead. Using: inset";
+  }
+
+  @if $color == none {
+    @include multiple-box-shadows(none);
+  } @else {
+    $full   : $hoff $voff;
+    @if $blur   { $full: $full $blur;   }
+    @if $spread { $full: $full $spread; }
+    @if $color  { $full: $full $color;  }
+    @if $inset  { $full: inset $full;   }
+    @include multiple-box-shadows($full);
+  }
+}
+
+// Provides cross-browser box shadows when one or more box shadows are needed.
+@mixin multiple-box-shadows(
+  $shadow-1 : default,
+  $shadow-2 : false,
+  $shadow-3 : false,
+  $shadow-4 : false,
+  $shadow-5 : false,
+  $shadow-6 : false,
+  $shadow-7 : false,
+  $shadow-8 : false,
+  $shadow-9 : false,
+  $shadow-10: false
+) {
+  
+  @if not ($default-box-shadow-inset == true or $default-box-shadow-inset == false or $default-box-shadow-inset == inset) {
+    @warn "$default-box-shadow-inset expected to be true or the inset keyword. Got #{$default-box-shadow-inset} instead. Using: inset";
+  }
+  
+  @if $shadow-1 == default {
+    $shadow-1 : -compass-space-list(compact(if($default-box-shadow-inset, inset), $default-box-shadow-h-offset, $default-box-shadow-v-offset, $default-box-shadow-blur, $default-box-shadow-spread, $default-box-shadow-color));
+  }
+  
+  $shadow : compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10);
+  @include experimental(box-shadow, $shadow,
+    -moz, -webkit, -o, not -ms, not -khtml, official
+  );
+}
+
+@mixin box-shadow(
+  $shadow-1 : default,
+  $shadow-2 : false,
+  $shadow-3 : false,
+  $shadow-4 : false,
+  $shadow-5 : false,
+  $shadow-6 : false,
+  $shadow-7 : false,
+  $shadow-8 : false,
+  $shadow-9 : false,
+  $shadow-10: false
+) {
+  @include multiple-box-shadows(
+    $shadow-1, $shadow-2, $shadow-3,
+    $shadow-4, $shadow-5, $shadow-6,
+    $shadow-7, $shadow-8, $shadow-9, $shadow-10
+  );
+}

data/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss

@@ -1,31 +1,8 @@
-// @doc off
-// These defaults make the arguments optional for this mixin
-// If you like, set different defaults before importing.
-// @doc on
-
-@import "shared";
-
-// The default color for box shadows
-$default-box-shadow-color: #333333 !default;
-
-// The default horizontal offset. Positive is to the right.
-$default-box-shadow-h-offset: 1px !default;
-
-// The default vertical offset. Positive is down.
-$default-box-shadow-v-offset: 1px !default;
-
-// The default blur length.
-$default-box-shadow-blur: 5px !default;
-
-// The default spread length.
-$default-box-shadow-spread : 0 !default;
-
-// The default shadow instet: inset or false (for standard shadow).
-$default-box-shadow-inset : false !default;
-
-// Provides cross-browser CSS box shadows for Webkit, Gecko, and CSS3.
-// Arguments are color, horizontal offset, vertical offset, blur length, spread length, and inset.
+@import "box-shadow-v2";
 
+// This mixin is deprecated.
+// Use the box-shadow mixin from compass/css3/box-shadow-v2 instead.
+// @deprecated
 @mixin box-shadow(
   $color  : $default-box-shadow-color, 
   $hoff   : $default-box-shadow-h-offset, 
@@ -34,17 +11,7 @@ $default-box-shadow-inset : false !default;
   $spread : $default-box-shadow-spread, 
   $inset  : $default-box-shadow-inset
 ) {
-  $full   : $color $hoff $voff $blur $spread;
-  @if $inset {
-    $full: $full $inset;
-  }
-  @if $color == none {
-    @include experimental(box-shadow, none,
-      -moz, -webkit, -o, not -ms, not -khtml, official
-    );
-  } @else {  
-    @include experimental(box-shadow, $full,
-      -moz, -webkit, -o, not -ms, not -khtml, official
-    );
-  }
+  @warn "This version of the box-shadow mixin has been deprecated. Please read: http://compass-style.org/docs/upgrading/css3-v2/#box-shadow for details.";
+  @include single-box-shadow($color, $hoff, $voff, $blur, $spread, $inset);
 }
+

data/frameworks/compass/stylesheets/compass/css3/_box.scss

@@ -45,7 +45,6 @@ $default-box-flex: 0 !default;
   @include experimental(box-flex, $flex,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );
-  display: block;
 }
 
 // Default flex group

data/frameworks/compass/stylesheets/compass/css3/_columns.scss

@@ -1,55 +1,60 @@
 @import "shared";
 
 // Specify the number of columns
-@mixin column-count($n) {
-  @include experimental(column-count, $n,
+@mixin column-count($count) {
+  @include experimental(column-count, $count,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
 // Specify the gap between columns e.g. `20px`
-@mixin column-gap($u) {
-  @include experimental(column-gap, $u,
+@mixin column-gap($width) {
+  @include experimental(column-gap, $width,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
 // Specify the width of columns e.g. `100px`
-@mixin column-width($u) {
-  @include experimental(column-width, $u,
+@mixin column-width($width) {
+  @include experimental(column-width, $width,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
 // Specify the width of the rule between columns e.g. `1px`
-@mixin column-rule-width($w) {
-  @include experimental(rule-width, $w,
+@mixin column-rule-width($width) {
+  @include experimental(rule-width, $width,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
 // Specify the style of the rule between columns e.g. `dotted`.
 // This works like border-style.
-@mixin column-rule-style($s) {
-  @include experimental(rule-style, unquote($s),
+@mixin column-rule-style($style) {
+  @include experimental(rule-style, unquote($style),
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
-// Specify the style of the rule between columns e.g. `dotted`.
+// Specify the color of the rule between columns e.g. `blue`.
 // This works like border-color.
-
-@mixin column-rule-color($c) {
-  @include experimental(rule-color, unquote($s),
+@mixin column-rule-color($color) {
+  @include experimental(rule-color, $color,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
 
-// Mixin encompassing all column rule rules
+// Mixin encompassing all column rule properties
 // For example:
-//     +column-rule(1px, solid, #c00)
-@mixin column-rule($w, $s: solid, $c: black) {
-  @include experimental(column-rule, $w $s $c,
+//
+//     @include column-rule(1px, solid, #c00)
+//
+// Or the values can be space separated:
+//
+//     @include column-rule(1px solid #c00)
+@mixin column-rule($width, $style: false, $color: false) {
+  $full : -compass-space-list(compact($width, $style, $color));
+  @include experimental(column-rule, $full,
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }