compass 0.10.0.rc5 → 0.10.0.rc6

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: rc5
+:build: rc6

data/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass

@@ -1,2 +1,2 @@
 @warn "DEPRECATED: blueprint/screen.sass will be removed. Please @import \"blueprint\" instead."
-@import blueprint.sass
+@import blueprint

data/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass

@@ -1,162 +1,2 @@
-@import colors.sass
-@import compass/utilities/links/link-colors
-@import compass/utilities/general/float
-
-!blueprint_font_family       ||= "Helvetica Neue, Arial, Helvetica, sans-serif"
-!blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace"
-!blueprint_font_size         ||= 12px
-
-// Usage examples:
-// As a top-level mixin, apply to any page that includes the stylesheet:
-//   +blueprint-typography
-// Scoped by a presentational class:
-//   body.blueprint
-//    +blueprint-typography(true)
-// Scoped by semantic selectors:
-//   body#page-1, body#page-2, body.a-special-page-type
-//     +blueprint-typography(true)
-// Deprecated:
-//   You can pass the body selector as the first argument when used as a top-level mixin
-//   +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
-=blueprint-typography(!body_selector = "body")
-  @if !body_selector == true
-    +blueprint-typography-body
-    +blueprint-typography-defaults
-  @else
-    #{!body_selector}
-      +blueprint-typography-body
-      @if !body_selector != "body"
-        @warn "[DEPRECATED] To specify a the selector \"#{!body_selector}\" to +blueprint-typography, pass true as the first argument and mix it into #{!body_selector}."
-        +blueprint-typography-defaults
-    @if !body_selector == "body"
-      +blueprint-typography-defaults
-
-=normal-text
-  font-family= !blueprint_font_family
-  color= !font_color
-
-=fixed-width-text
-  font= 1em !blueprint_fixed_font_family
-  line-height: 1.5
-
-=header-text
-  font-weight: normal
-  color= !header_color
-
-=quiet
-  color= !quiet_color
-
-=loud
-  color= !loud_color
-
-=blueprint-typography-body(!font_size = !blueprint_font_size)
-  line-height: 1.5
-  +normal-text
-  font-size= 100% * !font_size / 16px
-
-=blueprint-typography-defaults
-  h1
-    +header-text
-    font-size: 3em
-    line-height: 1
-    margin-bottom: 0.5em
-    img
-      margin: 0
-  h2
-    +header-text
-    font-size: 2em
-    margin-bottom: 0.75em
-  h3
-    +header-text
-    font-size: 1.5em
-    line-height: 1
-    margin-bottom: 1em
-  h4
-    +header-text
-    font-size: 1.2em
-    line-height: 1.25
-    margin-bottom: 1.25em
-  h5
-    +header-text
-    font-size: 1em
-    font-weight: bold
-    margin-bottom: 1.5em
-  h6
-    +header-text
-    font-size: 1em
-    font-weight: bold
-  h2 img,  h3 img,  h4 img,  h5 img,  h6 img
-    margin: 0
-  p
-    margin: 0 0 1.5em
-    img.left
-      +float-left
-      margin: 1.5em 1.5em 1.5em 0
-      padding: 0
-    img.right
-      +float-right
-      margin: 1.5em 0 1.5em 1.5em
-      padding: 0
-  a
-    text-decoration: underline
-    +link-colors(!link_color, !link_hover_color, !link_active_color, !link_visited_color, !link_focus_color)
-  blockquote
-    margin: 1.5em
-    color: #666
-    font-style: italic
-  strong
-    font-weight: bold
-  em
-    font-style: italic
-  dfn
-    font-style: italic
-    font-weight: bold
-  sup,  sub
-    line-height: 0
-  abbr,  acronym
-    border-bottom: 1px dotted #666
-  address
-    margin: 0 0 1.5em
-    font-style: italic
-  del
-    color: #666
-  pre
-    margin: 1.5em 0
-    white-space: pre
-  pre, code, tt
-    +fixed-width-text
-  li
-    ul, ol
-      margin: 0
-  ul, ol
-    margin: 0 1.5em 1.5em 0
-    padding-left: 3.333em
-  ul
-    list-style-type: disc
-  ol
-    list-style-type: decimal
-  dl
-    margin: 0 0 1.5em 0
-    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
-  tfoot
-    font-style: italic
-  caption
-    background: #eee
-  .quiet
-    +quiet
-  .loud
-    +loud
+@warn "DEPRECATED: blueprint/typography.sass will be removed. Please @import \"blueprint/typography\" instead."
+@import "blueprint/typography"

data/frameworks/blueprint/stylesheets/_blueprint.scss

@@ -11,19 +11,27 @@
 // ### Usage examples:
 //
 // As a top-level mixin, apply to any page that includes the stylesheet:
-//     +blueprint
+// <pre class="source-code sass">
+// +blueprint
+// </pre>
 //
 // Scoped by a presentational class:
-//     body.blueprint
-//       +blueprint(true)
+// <pre class="source-code sass">
+// body.blueprint
+//   +blueprint(true)
+// </pre>
 //
 // Scoped by semantic selectors:
-//     body#page-1, body#page-2, body.a-special-page-type
-//       +blueprint(true)
+// <pre class="source-code sass">
+// body#page-1, body#page-2, body.a-special-page-type
+//   +blueprint(true)
+// </pre>
 //
 // #### Deprecated:
 // You use to be able to pass the body selector as the first argument when used as a top-level mixin
-//      +blueprint("body#page-1, body#page-2, body.a-special-page-type")
+// <pre class="source-code sass">
+// +blueprint("body#page-1, body#page-2, body.a-special-page-type")
+// </pre>
 
 @mixin blueprint($body_selector: body) {
   //@doc off

data/frameworks/blueprint/stylesheets/blueprint/_grid.scss

@@ -189,15 +189,19 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 // For example:
 //
 // HTML:
-//     <div id="one">One</div>
-//     <div id="two">Two</div>
+// <pre class="source-code html">
+// <div id="one">One</div>
+// <div id="two">Two</div>
+// </pre>
 // Sass:
-//     #one
-//       +column(18, true)
-//       +prepend(6)
-//     #two
-//       +column(6)
-//       +pull(18, true)
+// <pre class="source-code sass">
+// #one
+//   +column(18, true)
+//   +prepend(6)
+// #two
+//   +column(6)
+//   +pull(18, true)
+// </pre>
 @mixin pull($n, $last: false) {
   @include pull-base;
   @include pull-margins($n, $last); }

data/frameworks/blueprint/stylesheets/blueprint/_ie.scss

@@ -9,22 +9,23 @@
 //| --------------
 //|
 //| As a top-level mixin, apply to any page that includes the stylesheet:
-//|
-//|     +blueprint-ie
-//|
+//| <pre class="source-code sass">
+//| +blueprint-ie
+//| </pre>
 //| Scoped by a presentational class:
-//|
-//|     body.blueprint
-//|      +blueprint-ie(true)
-//|
+//| <pre class="source-code sass">
+//| body.blueprint
+//|  +blueprint-ie(true)
+//| </pre>
 //| Scoped by semantic selectors:
-//|
-//|     body#page-1, body#page-2, body.a-special-page-type
-//|       +blueprint-ie(true)
-//|
+//| <pre class="source-code sass">
+//| body#page-1, body#page-2, body.a-special-page-type
+//|   +blueprint-ie(true)
+//| </pre>
 //| **Deprecated:** You can pass the body selector as the first argument when used as a top-level mixin
-//|
-//|     +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type")
+//| <pre class="source-code sass">
+//| +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type")
+//| </pre>
 @mixin blueprint-ie($body_selector: body) {
   @if $body_selector == true {
     @include blueprint-ie-body;

data/frameworks/blueprint/stylesheets/blueprint/_print.scss

@@ -3,16 +3,24 @@
 
 // Usage examples:
 // As a top-level mixin, apply to any page that includes the stylesheet:
-//   +blueprint-print
+// <pre class="source-code sass">
+// +blueprint-print
+// </pre>
 // Scoped by a presentational class:
-//   body.blueprint
-//    +blueprint-print(true)
+// <pre class="source-code sass">
+// body.blueprint
+//  +blueprint-print(true)
+// </pre>
 // Scoped by semantic selectors:
-//   body#page-1, body#page-2, body.a-special-page-type
-//     +blueprint-print(true)
+// <pre class="source-code sass">
+// body#page-1, body#page-2, body.a-special-page-type
+//   +blueprint-print(true)
+// </pre>
 // Deprecated:
-//   You can pass the body selector as the first argument when used as a top-level mixin
-//   +blueprint-print("body#page-1, body#page-2, body.a-special-page-type")
+// You can pass the body selector as the first argument when used as a top-level mixin
+// <pre class="source-code sass">
+// +blueprint-print("body#page-1, body#page-2, body.a-special-page-type")
+// </pre>
 @mixin blueprint-print($body_selector: body) {
   @if $body_selector == true {
     @include blueprint-print-body;

data/frameworks/blueprint/stylesheets/blueprint/_rtl.scss

@@ -76,16 +76,27 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 
 // Usage examples:
 // As a top-level mixin, apply to any page that includes the stylesheet:
-//   +rtl-typography
+// <pre class="source-code sass">
+// +rtl-typography
+// </pre>
+//
 // Scoped by a presentational class:
-//   body.blueprint
-//    +rtl-typography(true)
+// <pre class="source-code sass">
+// body.blueprint
+//  +rtl-typography(true)
+// </pre>
+//
 // Scoped by semantic selectors:
-//   body#page-1, body#page-2, body.a-special-page-type
-//     +rtl-typography(true)
-// Deprecated:
-//   You can pass the body selector as the first argument when used as a top-level mixin
-//   +rtl-typography("body#page-1, body#page-2, body.a-special-page-type")
+// <pre class="source-code sass">
+// body#page-1, body#page-2, body.a-special-page-type
+//   +rtl-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">
+// +rtl-typography("body#page-1, body#page-2, body.a-special-page-type")
+// </pre>
 @mixin rtl-typography($body_selector: body) {
   @if $body_selector == true {
     html & {

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

@@ -16,11 +16,14 @@
 //   mixins to construct your own semantic style rules.
 
 @mixin blueprint-scaffolding($body_selector: body) {
-  #{$body_selector} {
-    @if $body_selector != "body" {
-      @include blueprint-scaffolding-defaults; } }
-  @if $body_selector == "body" {
-    @include blueprint-scaffolding-defaults; } }
+  @if $body_selector != body {
+    #{$body_selector} {
+      @include blueprint-scaffolding-defaults;
+    }
+  } @else {
+    @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.

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

@@ -10,16 +10,27 @@ $blueprint-font-size: 12px !default;
 
 // Usage examples:
 // As a top-level mixin, apply to any page that includes the stylesheet:
-//   +blueprint-typography
+// <pre class="source-code sass">
+// +blueprint-typography
+// </pre>
+//
 // Scoped by a presentational class:
-//   body.blueprint
-//    +blueprint-typography(true)
+// <pre class="source-code sass">
+// body.blueprint
+//  +blueprint-typography(true)
+// </pre>
+//
 // Scoped by semantic selectors:
-//   body#page-1, body#page-2, body.a-special-page-type
-//     +blueprint-typography(true)
-// Deprecated:
-//   You can pass the body selector as the first argument when used as a top-level mixin
-//   +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
+// <pre class="source-code sass">
+// 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 {
     @include blueprint-typography-body;
@@ -53,11 +64,11 @@ $blueprint-font-size: 12px !default;
 @mixin blueprint-typography-defaults {
   #{headers(all)} { @include header-text;
     img             { margin: 0; } }
-  h1              { font-size: 3em;   line-height: 1;    margin-bottom: 0.5em;  }
+  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: 1em;    }
+  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.5em;  }
+  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; }

data/frameworks/blueprint/templates/basic/partials/_base.sass

@@ -1,9 +1,9 @@
 // Here is where you can define your constants for your application and to configure the blueprint framework.
 // Feel free to delete these if you want keep the defaults:
 
-!blueprint_grid_columns = 24
-!blueprint_grid_width = 30px
-!blueprint_grid_margin  = 10px
+$blueprint-grid-columns : 24
+$blueprint-grid-width   : 30px
+$blueprint-grid-margin  : 10px
 
 // If you change your grid column dimensions
 // you can make a new grid background image from the command line like this:

data/frameworks/blueprint/templates/buttons/buttons.sass

@@ -20,7 +20,7 @@ a.button
   // you can pass "left" or "right" to +anchor-button to float it in that direction
   // or you can pass no argument to leave it inline-block (cross browser safe!) within
   // the flow of your page.
-  +anchor-button("left")
+  +anchor-button(left)
   // All the button color mixins take 4 optional arguments:
   // font color, background color, border color, border highlight color
   // the first three default to constants set in blueprint/buttons.sass
@@ -31,7 +31,7 @@ a.button
 
 button
   // The +button-button mixin is just like the +anchor-button mixin, but for <button> elements.
-  +button-button("left")
+  +button-button(left)
   +button-colors
   +button-hover-colors
   +button-active-colors

data/frameworks/blueprint/templates/project/partials/_base.sass

@@ -1,11 +1,11 @@
 // Here is where you can define your constants for your application and to configure the blueprint framework.
 // Feel free to delete these if you want keep the defaults:
 
-!blueprint_grid_columns = 24
-!blueprint_container_size = 950px
-!blueprint_grid_margin  = 10px
+$blueprint-grid-columns   : 24
+$blueprint-container-size : 950px
+$blueprint-grid-margin    : 10px
 
 // Use this to calculate the width based on the total width.
 // Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
-!blueprint_grid_width   = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
+$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin
 

data/frameworks/blueprint/templates/project/screen.sass

@@ -27,15 +27,16 @@ body.two-col
   #container
     +container
   #header, #footer
-    +column(!blueprint_grid_columns)
+    +column($blueprint-grid-columns)
   #sidebar
     // One third of the grid columns, rounding down. With 24 cols, this is 8.
-    !sidebar_columns = floor(!blueprint_grid_columns / 3)
-    +column(!sidebar_columns)
+    $sidebar-columns: floor($blueprint-grid-columns / 3)
+    +column($sidebar-columns)
   #content
     // Two thirds of the grid columns, rounding up.
     // With 24 cols, this is 16.
-    !content_columns = ceil(2 * !blueprint_grid_columns / 3)
+    $content-columns: ceil(2 * $blueprint-grid-columns / 3)
     // true means it's the last column in the row
-    +column(!content_columns, true)
+    +column($content-columns, true)
+
 

data/frameworks/blueprint/templates/semantic/partials/_base.sass

@@ -1,11 +1,10 @@
 // Here is where you can define your constants for your application and to configure the blueprint framework.
 // Feel free to delete these if you want keep the defaults:
 
-!blueprint_grid_columns = 24
-!blueprint_container_size = 950px
-!blueprint_grid_margin  = 10px
+$blueprint-grid-columns: 24
+$blueprint-container-size: 950px
+$blueprint-grid-margin: 10px
 
 // Use this to calculate the width based on the total width.
 // Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
-!blueprint_grid_width   = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
-
+$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin

data/frameworks/blueprint/templates/semantic/partials/_two_col.sass

@@ -25,14 +25,14 @@ body.two-col
   #container
     +container
   #header, #footer
-    +column(!blueprint_grid_columns)
+    +column($blueprint-grid-columns)
   #sidebar
     // One third of the grid columns, rounding down. With 24 cols, this is 8.
-    !sidebar_columns = floor(!blueprint_grid_columns / 3)
-    +column(!sidebar_columns)
+    $sidebar-columns: floor($blueprint-grid-columns / 3)
+    +column($sidebar-columns)
   #content
     // Two thirds of the grid columns, rounding up.
     // With 24 cols, this is 16.
-    !content_columns = ceil(2 * !blueprint_grid_columns / 3)
+    $content-columns: ceil(2 * $blueprint-grid-columns / 3)
     // true means it's the last column in the row
-    +column(!content_columns, true)
+    +column($content-columns, true)

data/frameworks/compass/stylesheets/compass/css3/_background-clip.scss

@@ -19,6 +19,7 @@ $default-background-clip: padding-box !default;
 
 @mixin background-clip($clip: $default-background-clip) {
   // webkit and mozilla use the deprecated short [border | padding]
+  $clip: unquote($clip);
   $deprecated: $clip;
   @if $clip == padding-box { $deprecated: padding; }
   @if $clip == border-box { $deprecated: border; }

data/frameworks/compass/stylesheets/compass/css3/_background-origin.scss

@@ -15,6 +15,7 @@ $default-background-origin: content-box !default;
 
 
 @mixin background-origin($origin: $default-background-origin) {
+  $origin: unquote($origin);
   // webkit and mozilla use the deprecated short [border | padding | content]
   $deprecated: $origin;
   @if $origin == padding-box { $deprecated: padding; }

data/frameworks/compass/stylesheets/compass/css3/_background-size.scss

@@ -9,5 +9,6 @@ $default-background-size: 100% auto !default;
 // * percentages are relative to the background-origin (default = padding-box)
 // * mixin defaults to: `$default-background-size`
 @mixin background-size($size: $default-background-size) {
+  $size: unquote($size);
   @include experimental(background-size, $size, -moz, -webkit, -o, not -ms, not -khtml);
 }

data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss

@@ -14,9 +14,6 @@ $default-border-radius: 5px !default;
 // * legal values for `$horz`: `left`, `right`
 
 @mixin border-corner-radius($vert, $horz, $radius: $default-border-radius) {
-  border-#{$vert}-#{$horz}-radius: $radius;
-  -moz-border-radius-#{$vert}#{$horz}: $radius;
-  -webkit-border-#{$vert}-#{$horz}-radius: $radius;
   // Support for mozilla's syntax for specifying a corner
   @include experimental("border-radius-#{$vert}#{$horz}", $radius,
     -moz,

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

@@ -6,6 +6,7 @@
 //   [ content-box | border-box ]
 
 @mixin box-sizing($bs) {
+  $bs: unquote($bs);
   @include experimental(box-sizing, $bs,
     -moz, -webkit, not -o, -ms, not -khtml, official
   );

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

@@ -14,6 +14,7 @@ $default-box-orient: horizontal !default;
 @mixin box-orient(
   $orientation: $default-box-orient
 ) {
+  $orientation : unquote($orientation);
   @include experimental(box-orient, $orientation,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );
@@ -26,6 +27,7 @@ $default-box-align: stretch !default;
 @mixin box-align(
   $alignment: $default-box-align
 ) {
+  $alignment : unquote($alignment);
   @include experimental(box-align, $alignment,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );
@@ -77,6 +79,7 @@ $default-box-direction: normal !default;
 @mixin box-direction(
   $direction: $default-box-direction
 ) {
+  $direction: unquote($direction);
   @include experimental(box-direction, $direction,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );
@@ -89,6 +92,7 @@ $default-box-lines: single !default;
 @mixin box-lines(
   $lines: $default-box-lines
 ) {
+  $lines: unquote($lines);
   @include experimental(box-lines, $lines,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );
@@ -101,6 +105,7 @@ $default-box-pack: start !default;
 @mixin box-pack(
   $pack: $default-box-pack
 ) {
+  $pack: unquote($pack);
   @include experimental(box-pack, $pack,
     -moz, -webkit, not -o, not -ms, not -khtml, official
   );

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

@@ -31,7 +31,7 @@
 // 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, $s,
+  @include experimental(rule-style, unquote($s),
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }
@@ -40,7 +40,7 @@
 // This works like border-color.
 
 @mixin column-rule-color($c) {
-  @include experimental(rule-color, $s,
+  @include experimental(rule-color, unquote($s),
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }

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

@@ -29,7 +29,7 @@ $default-transition-delay: false !default;
 // * also accepts "all" or "none"
 
 @mixin transition-property($properties: $default-transition-property) {
-  @include experimental(transition-property, $properties,
+  @include experimental(transition-property, unquote($properties),
     -moz, -webkit, -o, not -ms, not -khtml, official
   );
 }

data/frameworks/compass/stylesheets/compass/utilities/general/_min.scss

@@ -13,4 +13,4 @@
 // @private This mixin is not meant to be used directly.
 @mixin hacked-minimum($property, $value) {
   min-#{$property}: $value;
-  @include bang-hack($property, $value, auto); }
+  @include bang-hack($property, auto, $value); }

data/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss

@@ -1,9 +1,9 @@
 @import "compass/css3/shared";
 
-// To get firefox2 support, you must install the ellipsis pattern:
+// To get full firefox support, you must install the ellipsis pattern:
 //
 //     compass install compass/ellipsis
-$firefox2-ellipsis: false !default;
+$use-mozilla-ellipsis-binding: false !default;
 
 // This technique, by [Justin Maxwell](http://code404.com/), was originally
 // published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
@@ -19,7 +19,7 @@ $firefox2-ellipsis: false !default;
     not -khtml,
     official
   );
-  @if $experimental-support-for-mozilla and $firefox2-ellipsis {
+  @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
     -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));    
   }
 }

data/frameworks/compass/templates/ellipsis/ellipsis.sass

@@ -1,6 +1,6 @@
-// Since you've installed the xml file, you must set
-// $firefox2-ellipsis to true before importing.
-$firefox2-ellipsis: true
+// Since you've installed the xml file, you should set
+// $use-mozilla-ellipsis-binding to true before importing.
+$use-mozilla-ellipsis-binding: true
 @import compass/utilities/text/ellipsis
 
 // You can delete this sass file if you want, it's just an example of how to use the ellipsis mixin.

data/frameworks/compass/templates/project/screen.sass

@@ -5,9 +5,3 @@
   <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
 
 @import compass/reset
-
-/*
-  The *:focus rule is reset and suppresses link outlining.
-  You _must_ remember to redefine your own outline, as it’s an important accessibility aid. E.g.
-  *:focus
-    outline: #ccc dotted medium

data/lib/compass/commands/registry.rb

@@ -6,11 +6,24 @@ module Compass::Commands
     end
     def get(name)
       @commands ||= Hash.new
-      @commands[name.to_sym]
+      @commands[name.to_sym] || @commands[abbreviation_of(name)]
+    end
+    def abbreviation_of(name)
+      re = /^#{Regexp.escape(name)}/
+      matching = @commands.keys.select{|k| k.to_s =~ re}
+      if matching.size == 1
+        matching.first
+      else
+        raise Compass::Error, "Ambiguous abbreviation '#{name}'. Did you mean one of: #{matching.join(", ")}"
+      end
+    end
+    def abbreviation?(name)
+      re = /^#{Regexp.escape(name)}/
+      @commands.keys.detect{|k| k.to_s =~ re}
     end
     def command_exists?(name)
       @commands ||= Hash.new
-      name && @commands.has_key?(name.to_sym)
+      name && (@commands.has_key?(name.to_sym) || abbreviation?(name))
     end
     def all
       @commands.keys

data/lib/compass/configuration/adapters.rb

@@ -8,13 +8,13 @@ module Compass
       end
 
       def to_sass_plugin_options
-        locations = {}
-        locations[sass_path] = css_path if sass_path && css_path
+        locations = []
+        locations << [sass_path, css_path] if sass_path && css_path
         Compass::Frameworks::ALL.each do |framework|
-          locations[framework.stylesheets_directory] = css_path || css_dir || "."
+          locations << [framework.stylesheets_directory, css_path || css_dir || "."]
         end
         resolve_additional_import_paths.each do |additional_path|
-          locations[additional_path] = File.join(css_path || css_dir || ".", File.basename(additional_path))
+          locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
         end
         plugin_opts = {:template_location => locations}
         plugin_opts[:style] = output_style if output_style

data/lib/compass/exec/switch_ui.rb

@@ -120,6 +120,10 @@ END
         self.options[:pattern_name] = name
       end
 
+      opts.on("-x", "--syntax SYNTAX", [:sass, :scss], "Specify the syntax to use when generating stylesheets.", "One of sass or scss. Defaults to scss.") do |syntax|
+        self.options[:preferred_syntax] = syntax
+      end
+
       opts.on('--rails', "Sets the app type to a rails project (same as --app rails).") do
         self.options[:project_type] = :rails
       end

data/lib/compass/sass_extensions/functions/font_files.rb

@@ -7,5 +7,4 @@ module Compass::SassExtensions::Functions::FontFiles
     end
     Sass::Script::String.new(files.join(", "))
   end
-
 end

data/lib/compass/sass_extensions/functions/selectors.rb

@@ -60,4 +60,5 @@ module Compass::SassExtensions::Functions::Selectors
     end
     Sass::Script::String.new((from.value..to.value).map{|n| "h#{n}"}.join(", "))
   end
+  alias headings headers
 end

data/lib/compass/sass_extensions/functions/urls.rb

@@ -11,7 +11,7 @@ module Compass::SassExtensions::Functions::Urls
       Compass.configuration.http_root_relative(Compass.configuration.css_dir)
     end
 
-    url("#{http_stylesheets_path}/#{path}")
+    clean_url("#{http_stylesheets_path}/#{path}")
   end
 
   def font_url(path)
@@ -30,7 +30,7 @@ module Compass::SassExtensions::Functions::Urls
                         Compass.configuration.http_fonts_path
                       end
 
-    url("#{http_fonts_path}/#{path}")
+    clean_url("#{http_fonts_path}/#{path}")
   end
 
   def image_url(path)
@@ -75,18 +75,18 @@ module Compass::SassExtensions::Functions::Urls
     # prepend the asset host if there is one.
     path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
-    url(path)
+    clean_url(path)
   end
 
+  private
+
   # Emits a url, taking off any leading "./"
-  def url(url)
+  def clean_url(url)
     url = url.to_s
     url = url[0..1] == "./" ? url[2..-1] : url
     Sass::Script::String.new("url('#{url}')")
   end
 
-  private
-
   def relative?
     Compass.configuration.relative_assets?
   end

data/test/configuration_test.rb

@@ -81,8 +81,8 @@ class ConfigurationTest < Test::Unit::TestCase
 
     assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/home/chris/my_compass_project/../foo")
     assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/path/to/my/framework"), Compass.configuration.to_sass_engine_options[:load_paths].inspect
-    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location]["/path/to/my/framework"]
-    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location]["/home/chris/my_compass_project/../foo"]
+    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
+    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
 # Require any additional compass plugins here.
@@ -111,8 +111,8 @@ EXPECTED
 
     assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/home/chris/my_compass_project/../foo")
     assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/path/to/my/framework"), Compass.configuration.to_sass_engine_options[:load_paths].inspect
-    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location]["/path/to/my/framework"]
-    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location]["/home/chris/my_compass_project/../foo"]
+    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
+    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
 # Require any additional compass plugins here.

data/test/fixtures/stylesheets/blueprint/css/typography.css

@@ -13,7 +13,7 @@ h1, h2, h3, h4, h5, h6 {
 h1 {
   font-size: 3em;
   line-height: 1;
-  margin-bottom: 0.5em; }
+  margin-bottom: 0.50em; }
 
 h2 {
   font-size: 2em;
@@ -22,7 +22,7 @@ h2 {
 h3 {
   font-size: 1.5em;
   line-height: 1;
-  margin-bottom: 1em; }
+  margin-bottom: 1.00em; }
 
 h4 {
   font-size: 1.2em;
@@ -32,7 +32,7 @@ h4 {
 h5 {
   font-size: 1em;
   font-weight: bold;
-  margin-bottom: 1.5em; }
+  margin-bottom: 1.50em; }
 
 h6 {
   font-size: 1em;

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 0
-  - rc5
-  version: 0.10.0.rc5
+  - rc6
+  version: 0.10.0.rc6
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 -07:00
+date: 2010-05-08 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency