compass 0.12.alpha.0 → 0.12.alpha.1

data/examples/downloader.rb

@@ -9,8 +9,9 @@ def fetch(uri_str, limit = 10)
 
   url = URI.parse(uri_str)
   http = Net::HTTP.new(url.host, url.port)
-  http.open_timeout = 2
+  http.open_timeout = 10
   http.read_timeout = 30
+  http.use_ssl = true
   response = http.start do |http|
      puts "getting #{url.path}"
      http.request_get(url.path)
@@ -25,7 +26,7 @@ def fetch(uri_str, limit = 10)
 end
 
 def install_from_github(user, project, ext_name, branch = "master", working_directory = Dir.pwd)
-  download_link = "http://github.com/#{user}/#{project}/zipball/#{branch}"
+  download_link = "https://github.com/#{user}/#{project}/zipball/#{branch}"
   extdir = File.join(working_directory,'extensions')
   
   if !File.exists?("#{extdir}/#{ext_name}")

data/examples/ninesixty/bootstrap.rb

@@ -1,4 +1,4 @@
 require File.join(File.dirname(__FILE__), '..', 'downloader')
 
-install_from_github('chriseppstein', 'compass-960-plugin', 'ninesixty')
+install_from_github('nextmat', 'compass-960-plugin', 'ninesixty')
 

data/features/command_line.feature

@@ -200,7 +200,7 @@ Feature: Command Line
       | tmp/box_shadow.css          |
       | tmp/columns.css             |
       | tmp/fonts.css               |
-      | images/flag-s8c3c755a68.png |
+      | images/flag-s8f1e8fdb9b.png |
     And the following files are removed:
       | .sass-cache/                |
       | tmp/border_radius.css       |
@@ -208,7 +208,7 @@ Feature: Command Line
       | tmp/box_shadow.css          |
       | tmp/columns.css             |
       | tmp/fonts.css               |
-      | images/flag-s8c3c755a68.png |
+      | images/flag-s8f1e8fdb9b.png |
 
   Scenario: Watching a project for changes
     Given ruby supports fork
@@ -277,21 +277,21 @@ Feature: Command Line
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass stats
     Then I am told statistics for each file:
-      | Filename                  | Rules | Properties |    Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
-      | sass/border_radius.scss   |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/box.sass             |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/fonts.sass           |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/gradients.sass       |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/image_size.sass      |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/images.scss          |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/layout.sass          |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/legacy_clearfix.scss |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/lists.scss           |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/print.sass           |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/reset.sass           |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | sass/utilities.scss       |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
-      | ------------------------- | ----- | ---------- | -------------- | ----------- | --------- | -------------- |
-      | Total.*                   |   \d+ |        \d+ |            \d+ |         \d+ |       \d+ |            \d+ |
+      | Filename                  | Rules | Properties |    Mixins Defs | Mixins Used | CSS Selectors | CSS Properties |
+      | sass/border_radius.scss   |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/box.sass             |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/fonts.sass           |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/gradients.sass       |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/image_size.sass      |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/images.scss          |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/layout.sass          |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/legacy_clearfix.scss |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/lists.scss           |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/print.sass           |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/reset.sass           |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | sass/utilities.scss       |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
+      | ------------------------- | ----- | ---------- | -------------- | ----------- | ------------- | -------------- |
+      | Total.*                   |   \d+ |        \d+ |            \d+ |         \d+ |           \d+ |            \d+ |
 
   @listframeworks
   Scenario: List frameworks registered with compass

data/features/extensions.feature

@@ -28,3 +28,9 @@ Feature: Extensions
     And and I have a fake extension at ~/.compass/extensions/testing
     When I run: compass frameworks
     Then the list of frameworks includes "testing"
+
+  @listframeworks
+  Scenario: Frameworks without templates
+    Given I am using the existing project in test/fixtures/stylesheets/uses_only_stylesheets_ext
+    When I run: compass frameworks
+    Then the list of frameworks includes "only_stylesheets"

data/features/step_definitions/command_line_steps.rb

@@ -10,6 +10,8 @@ include Compass::RailsHelper
 
 Before do
   Compass.reset_configuration!
+  Compass::Frameworks::ALL.clear
+  Compass::Frameworks.discover :defaults
   @cleanup_directories = []
   @original_working_directory = Dir.pwd
 end

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

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

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

@@ -40,30 +40,13 @@ $default-box-shadow-inset : false !default;
   $shadow-9 : false,
   $shadow-10: false
 ) {
-  // This has to be on a single line due to a bug in the scss parser: https://github.com/nex3/sass/issues/issue/26
-  $legacy: (type-of($shadow-1) == color and type-of(if($shadow-2, $shadow-2, 0)) == number and type-of(if($shadow-3, $shadow-3, 0)) == number and type-of(if($shadow-4, $shadow-4, 0)) == number and type-of(if($shadow-5, $shadow-5, 0)) == number and ($shadow-6 == inset or type-of($shadow-6) == bool) and ($shadow-2 or $shadow-3 or $shadow-4 or $shadow-5 or $shadow-6));
-  @if $legacy {
-    @warn "Passing separate arguments for a single shadow to box-shadow is deprecated. " +
-          "Pass the values as a single space-separated list, or use the single-box-shadow mixin. " +
-          "See http://beta.compass-style.org/help/tutorials/upgrading/antares/ for more info.";
-    @include single-box-shadow(
-      if($shadow-1, $shadow-1, $default-box-shadow-color),
-      if($shadow-2, $shadow-2, $default-box-shadow-h-offset),
-      if($shadow-3, $shadow-3, $default-box-shadow-v-offset),
-      if($shadow-4, $shadow-4, $default-box-shadow-blur),
-      if($shadow-5, $shadow-5, $default-box-shadow-spread),
-      if($shadow-6, $shadow-6, $default-box-shadow-inset)
-    );
-  }
-  @else {
-    @if $shadow-1 == default {
-      $shadow-1 : -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $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
-    );
+  @if $shadow-1 == default {
+    $shadow-1 : -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $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
+  );
 }
 
 // Provides a single cross-browser CSS box shadow for Webkit, Gecko, and CSS3.
@@ -90,4 +73,4 @@ $default-box-shadow-inset : false !default;
     @if $inset  { $full: inset $full;   }
     @include box-shadow($full);
   }
-}
+}

data/frameworks/compass/stylesheets/compass/css3/_font-face.scss

@@ -46,18 +46,3 @@
     }
   }
 }
-
-// EXAMPLE
-// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot", bold, italic)
-//
-// will generate:
-//
-//   @font-face { 
-//     font-family: 'this name'; 
-//     src: url('fonts/this.eot'); 
-//     src: local("☺"),
-//       url('fonts/this.otf') format('woff'), 
-//       url('fonts/this.woff') format('opentype'); 
-//     font-weight: bold;
-//     font-style: italic;
-//   }

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

@@ -5,34 +5,34 @@
 // the implementations are identical except for the property
 // prefix.
 @mixin experimental($property, $value,
-  $moz      : $experimental-support-for-mozilla,
   $webkit   : $experimental-support-for-webkit,
-  $o        : $experimental-support-for-opera,
-  $ms       : $experimental-support-for-microsoft,
   $khtml    : $experimental-support-for-khtml,
+  $moz      : $experimental-support-for-mozilla,
+  $ms       : $experimental-support-for-microsoft,
+  $o        : $experimental-support-for-opera,
   $official : true
 ) {
-  @if $moz     and $experimental-support-for-mozilla   {    -moz-#{$property} : $value; }
   @if $webkit  and $experimental-support-for-webkit    { -webkit-#{$property} : $value; }
-  @if $o       and $experimental-support-for-opera     {      -o-#{$property} : $value; }
-  @if $ms      and $experimental-support-for-microsoft {     -ms-#{$property} : $value; }
   @if $khtml   and $experimental-support-for-khtml     {  -khtml-#{$property} : $value; }
+  @if $moz     and $experimental-support-for-mozilla   {    -moz-#{$property} : $value; }
+  @if $ms      and $experimental-support-for-microsoft {     -ms-#{$property} : $value; }
+  @if $o       and $experimental-support-for-opera     {      -o-#{$property} : $value; }
   @if $official                                        {         #{$property} : $value; }
 }
 
 // Same as experimental(), but for cases when the property is the same and the value is vendorized
 @mixin experimental-value($property, $value,
-  $moz      : $experimental-support-for-mozilla,
   $webkit   : $experimental-support-for-webkit,
-  $o        : $experimental-support-for-opera,
-  $ms       : $experimental-support-for-microsoft,
   $khtml    : $experimental-support-for-khtml,
+  $moz      : $experimental-support-for-mozilla,
+  $ms       : $experimental-support-for-microsoft,
+  $o        : $experimental-support-for-opera,
   $official : true
 ) {
-  @if $moz     and $experimental-support-for-mozilla   { #{$property} :    -moz-#{$value}; }
   @if $webkit  and $experimental-support-for-webkit    { #{$property} : -webkit-#{$value}; }
-  @if $o       and $experimental-support-for-opera     { #{$property} :      -o-#{$value}; }
-  @if $ms      and $experimental-support-for-microsoft { #{$property} :     -ms-#{$value}; }
   @if $khtml   and $experimental-support-for-khtml     { #{$property} :  -khtml-#{$value}; }
+  @if $moz     and $experimental-support-for-mozilla   { #{$property} :    -moz-#{$value}; }
+  @if $ms      and $experimental-support-for-microsoft { #{$property} :     -ms-#{$value}; }
+  @if $o       and $experimental-support-for-opera     { #{$property} :      -o-#{$value}; }
   @if $official                                        { #{$property} :         #{$value}; }
 }

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

@@ -23,26 +23,12 @@ $default-text-shadow-blur:     1px  !default;
   $shadow-9 : false,
   $shadow-10: false
 ) {
-  // This has to be on a single line due to a bug in the scss parser: https://github.com/nex3/sass/issues/issue/26
-  $legacy: type-of($shadow-1) == color and type-of(if($shadow-2, $shadow-2, 0)) == number and type-of(if($shadow-3, $shadow-3, 0)) == number and type-of(if($shadow-4, $shadow-4, 0)) == number and ($shadow-2 or $shadow-3 or $shadow-4) and not($shadow-5 or $shadow-6 or $shadow-7 or $shadow-8 or $shadow-9 or $shadow-10);
-  @if $legacy {
-    @warn "Passing separate arguments for a single shadow to text-shadow is deprecated. " +
-          "Pass the values as a single space-separated list, or use the single-text-shadow mixin. " +
-          "See http://beta.compass-style.org/help/tutorials/upgrading/antares/ for more info.";
-    @include single-text-shadow(
-      $shadow-1,
-      if($shadow-2, $shadow-2, $default-text-shadow-h-offset),
-      if($shadow-3, $shadow-3, $default-text-shadow-v-offset),
-      if($shadow-4, $shadow-4, $default-text-shadow-blur)
-    );
-  } @else {
-    @if $shadow-1 == default {
-      $shadow-1: $default-text-shadow-color $default-text-shadow-h-offset $default-text-shadow-v-offset $default-text-shadow-blur;
-    }
-    text-shadow: compact($shadow-1, $shadow-2, $shadow-3,
-                         $shadow-4, $shadow-5, $shadow-6,
-                         $shadow-7, $shadow-8, $shadow-9, $shadow-10);
+  @if $shadow-1 == default {
+    $shadow-1: $default-text-shadow-color $default-text-shadow-h-offset $default-text-shadow-v-offset $default-text-shadow-blur;
   }
+  text-shadow: compact($shadow-1, $shadow-2, $shadow-3,
+                       $shadow-4, $shadow-5, $shadow-6,
+                       $shadow-7, $shadow-8, $shadow-9, $shadow-10);
 }
 
 // Provides a single cross-browser CSS text shadow.
@@ -57,6 +43,6 @@ $default-text-shadow-blur:     1px  !default;
   @if $color == none {
     text-shadow: none;
   } @else {
-    text-shadow: $color $hoff $voff $blur;    
+    text-shadow: $color $hoff $voff $blur;
   }
 }

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

@@ -73,15 +73,42 @@ $default-transition-delay: false !default;
 // Transition all-in-one shorthand
 
 @mixin single-transition(
-  $properties: $default-transition-property,
+  $property: $default-transition-property,
   $duration: $default-transition-duration,
   $function: $default-transition-function,
   $delay: $default-transition-delay
 ) {
-  @include transition-property($properties);
-  @include transition-duration($duration);
-  @if $function { @include transition-timing-function($function); }
-  @if $delay { @include transition-delay($delay); }
+  @if $property and $duration and $function {
+    // Shorthand (see https://github.com/chriseppstein/compass/issues/585)
+    @if $delay {
+      -webkit-transition: $property $duration $function;
+      -webkit-transition-delay: $delay;
+      @include experimental(transition, $property $duration $function $delay,
+        -moz,
+        not -webkit,
+        -o,
+        not -ms,
+        not -khtml,
+        official
+      );
+    }
+    @else {
+      @include experimental(transition, $property $duration $function,
+        -moz,
+        -webkit,
+        -o,
+        not -ms,
+        not -khtml,
+        official
+      );
+    }
+  }
+  @else {
+    @include transition-property($property);
+    @include transition-duration($duration);
+    @if $function { @include transition-timing-function($function); }
+    @if $delay { @include transition-delay($delay); }
+  }
 }
 
 @mixin transition(
@@ -96,24 +123,11 @@ $default-transition-delay: false !default;
   $transition-9 : false,
   $transition-10: false
 ) {
-  $legacy: (type-of($transition-1) == string and type-of(if($transition-2, $transition-2, 0)) == number and type-of(if($transition-3, $transition-3, '')) == string and type-of(if($transition-4, $transition-4, 0)) == number and ($transition-2 or $transition-3 or $transition-4));
-  @if $legacy {
-    @warn "Passing separate arguments for a single transition to transition is deprecated. " +
-          "Pass the values as a single space-separated list, or use the single-transition mixin.";
-    @include single-transition(
-      if($transition-1, $transition-1, $default-transition-property),
-      if($transition-2, $transition-2, $default-transition-duration),
-      if($transition-3, $transition-3, $default-transition-function),
-      if($transition-4, $transition-4, $default-transition-delay)
-    );
-  }
-  @else {
-    @if $transition-1 == default {
-      $transition-1 : -compass-space-list(compact($default-transition-property, $default-transition-duration, $default-transition-function, $default-transition-delay));
-    }
-    $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
-    @include experimental(transition, $transition,
-      -moz, -webkit, -o, not -ms, not -khtml, official
-    );
+  @if $transition-1 == default {
+    $transition-1 : -compass-space-list(compact($default-transition-property, $default-transition-duration, $default-transition-function, $default-transition-delay));
   }
+  $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
+  @include experimental(transition, $transition,
+    -moz, -webkit, -o, not -ms, not -khtml, official
+  );
 }

data/frameworks/compass/stylesheets/compass/css3/_user-interface.scss

@@ -0,0 +1,19 @@
+@import "shared";
+
+// User Interface ------------------------------------------------------------
+// This file can be expanded to handle all the user interface properties as
+// they become available in browsers:
+// http://www.w3.org/TR/2000/WD-css3-userint-20000216
+
+// User Select ---------------------------------------------------------------
+// This property controls the selection model and granularity of an element.
+//
+// @param $select
+//   [ none | text | toggle | element | elements | all | inherit ]
+
+@mixin user-select($select) {
+  $select: unquote($select);
+  @include experimental(user-select, $select,
+    -moz, -webkit, not -o, not -ms, -khtml, official
+  );
+}

data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss

@@ -1,3 +1,5 @@
+@import "compass/layout/grid-background";
+
 // The base font size
 $base-font-size: 16px !default;
 
@@ -58,8 +60,14 @@ $base-half-leader: $base-leader / 2;
 }
 
 // Show a background image that can be used to debug your alignments.
-@mixin debug-vertical-alignment($img: 'underline.png') {
-  background: url($img);
+// include the $img argument if you would rather use your own image than the
+// Compass default gradient image.
+@mixin debug-vertical-alignment($img: false) {
+  @if $img {
+    background: image-url($img);
+  } @else {
+    @include baseline-grid-background($base-rhythm-unit);
+  }
 }
 
 // Adjust a block to have a different font size and leading to maintain the rhythm.
@@ -149,7 +157,8 @@ $base-half-leader: $base-leader / 2;
   @include trailer($trailer, $font-size);
 }
 
-// Apply a border width to any side without destroying the vertical rhythm
+// Apply a border width to any side without destroying the vertical rhythm.
+// The available space ($lines) must be greater than the width of your border.
 @mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @if not $relative-font-sizing and $font-size != $base-font-size {
     @warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border";

data/frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss

@@ -2,7 +2,7 @@
 @mixin no-bullet {
   list-style-image : none;
   list-style-type  : none;
-  margin-left      : 0px;
+  margin-left      : 0;
 }
 
 // turns off the bullets for an entire list

data/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss

@@ -2,18 +2,22 @@
 //
 // Easy mode using simple descendant li selectors:
 //
-//   ul.nav
-//     +inline-block-list
+//     ul.nav {
+//       @import inline-block-list;
+//     }
 //
 // Advanced mode:
 // If you need to target the list items using a different selector then use
-// +inline-block-list-container on your ul/ol and +inline-block-list-item on your li.
-// This may help when working on layouts involving nested lists. For example:
+// `@include inline-block-list-container` on your ul/ol and
+// `@include inline-block-list-item` on your li. This may help when working
+// on layouts involving nested lists. For example:
 //
-//   ul.nav
-//     +inline-block-list-container
-//     > li
-//       +inline-block-list-item
+//     ul.nav {
+//       @include inline-block-list-container;
+//       > li {
+//         @include inline-block-list-item;
+//       }
+//     }
 
 @import "bullets";
 @import "horizontal-list";
@@ -21,13 +25,12 @@
 @import "compass/css3/inline-block";
 
 // Can be mixed into any selector that target a ul or ol that is meant
-// to have an inline-block layout. Used to implement +inline-block-list.
+// to have an inline-block layout. Used to implement `inline-block-list`.
 @mixin inline-block-list-container {
   @include horizontal-list-container; }
 
 // Can be mixed into any li selector that is meant to participate in a horizontal layout.
-// Used to implement +inline-block-list.
-
+// Used to implement `inline-block-list`.
 @mixin inline-block-list-item($padding: false) {
   @include no-bullet;
   @include inline-block;