compass 0.12.0 → 0.12.7

data/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; }
@@ -67,8 +69,8 @@
 
 // Reset the font and vertical alignment.
 @mixin reset-font {
-  font-size: 100%;
   font: inherit;
+  font-size: 100%;
   vertical-align: baseline; }
 
 // Resets the outline when focus.

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

@@ -1,18 +1,18 @@
 @import "compass/layout/grid-background";
 
-// The base font size
+// The base font size.
 $base-font-size: 16px !default;
 
-// The base line height is the basic unit of line hightness.
+// The base line height determines the basic unit of vertical rhythm.
 $base-line-height: 24px !default;
 
-// set the default border style for rhythm borders
+// Set the default border style for rhythm borders.
 $default-rhythm-border-style: solid !default;
 
-// The IE font ratio is a fact of life. Deal with it.
-$ie-font-ratio: 16px / 100%;
+// The default font size in all browsers.
+$browser-default-font-size: 16px;
 
-// Set to false if you want to use absolute pixes in sizing your typography.
+// Set to false if you want to use absolute pixels in sizing your typography.
 $relative-font-sizing: true !default;
 
 // Allows the `adjust-font-size-to` mixin and the `lines-for-font-size` function
@@ -25,26 +25,26 @@ $round-to-nearest-half-line: false !default;
 $min-line-padding: 2px !default;
 
 // $base-font-size but in your output unit of choice.
-// Defaults to 1em when `$relative-font-sizing`
+// Defaults to 1em when `$relative-font-sizing` is true.
 $font-unit: if($relative-font-sizing, 1em, $base-font-size) !default;
 
-// The basic unit of font rhythm
+// The basic unit of font rhythm.
 $base-rhythm-unit: $base-line-height / $base-font-size * $font-unit;
 
 // The leader is the amount of whitespace in a line.
-// It might be useful in your calculations
+// It might be useful in your calculations.
 $base-leader: ($base-line-height - $base-font-size) * $font-unit / $base-font-size;
 
 // The half-leader is the amount of whitespace above and below a line.
-// It might be useful in your calculations
+// It might be useful in your calculations.
 $base-half-leader: $base-leader / 2;
 
-// True if a number has a relative unit
+// True if a number has a relative unit.
 @function relative-unit($number) {
   @return unit($number) == "%" or unit($number) == "em" or unit($number) == "rem"
 }
 
-// True if a number has an absolute unit
+// True if a number has an absolute unit.
 @function absolute-unit($number) {
   @return not (relative-unit($number) or unitless($number));
 }
@@ -53,24 +53,31 @@ $base-half-leader: $base-leader / 2;
   @warn "$relative-font-sizing is true but $font-unit is set to #{$font-unit} which is not a relative unit.";
 }
 
-// Establishes a font baseline for the given font-size in pixels
+// Establishes a font baseline for the given font-size.
 @mixin establish-baseline($font-size: $base-font-size) {
-  body {
-    font-size: $font-size / $ie-font-ratio;
-    @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
+  // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts
+  // whose root is set in ems. So we set the root font size in percentages of
+  // the default font size.
+  * html {
+    font-size: 100% * ($font-size / $browser-default-font-size);
   }
-  html>body {
+  html {
     font-size: $font-size;
+    @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
   }
 }
 
-// resets the baseline to 1 leading unit
+// Resets the line-height to 1 vertical rhythm unit.
+// Does not work on elements whose font-size is different from $base-font-size.
+//
+// @deprecated This mixin will be removed in the next release.
+// Please use the `adjust-leading-to` mixin instead.
 @mixin reset-baseline {
   @include adjust-leading-to(1, if($relative-font-sizing, $base-font-size, $base-font-size));
 }
 
 // Show a background image that can be used to debug your alignments.
-// include the $img argument if you would rather use your own image than the
+// 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 {
@@ -80,11 +87,11 @@ $base-half-leader: $base-leader / 2;
   }
 }
 
-// Adjust a block to have a different font size and leading to maintain the rhythm.
-// $lines is a number that is how many times the baseline rhythm this
-// font size should use up. Does not have to be an integer, but it defaults
-// to the smallest integer that is large enough to fit the font.
-// Use $from_size to adjust from a non-base font-size.
+// Adjust a block to have a different font size and line height to maintain the
+// rhythm. $lines specifies how many multiples of the baseline rhythm each line
+// of this font should use up. It does not have to be an integer, but it
+// defaults to the smallest integer that is large enough to fit the font.
+// Use $from-size to adjust from a font-size other than the base font-size.
 @mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) {
   @if not $relative-font-sizing and $from-size != $base-font-size {
     @warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to";
@@ -93,25 +100,32 @@ $base-half-leader: $base-leader / 2;
   @include adjust-leading-to($lines, if($relative-font-sizing, $to-size, $base-font-size));
 }
 
+// Adjust a block to have different line height to maintain the rhythm.
+// $lines specifies how many multiples of the baseline rhythm each line of this
+// font should use up. It does not have to be an integer, but it defaults to the
+// smallest integer that is large enough to fit the font.
 @mixin adjust-leading-to($lines, $font-size: $base-font-size) {
-  @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 adjust-leading-to";
-  }
-  line-height: $font-unit * $lines * $base-line-height / $font-size;
+  line-height: rhythm($lines, $font-size);
 }
 
-// Calculate rhythm units
+// Calculate rhythm units.
 @function rhythm(
   $lines: 1,
-  $font-size: $base-font-size
+  $font-size: $base-font-size,
+  $offset: 0
 ) {
   @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 the rhythm function";
   }
-  $rhythm: $font-unit * $lines * $base-line-height / $font-size;
+  $rhythm: $font-unit * ($lines * $base-line-height - $offset) / $font-size;
+  // Round the pixels down to nearest integer.
+  @if unit($rhythm) == px {
+    $rhythm: floor($rhythm);
+  }
   @return $rhythm;
 }
 
+// Calculate the minimum multiple of rhythm units needed to contain the font-size.
 @function lines-for-font-size($font-size) {
   $lines: if($round-to-nearest-half-line,
               ceil(2 * $font-size / $base-line-height) / 2,
@@ -122,46 +136,37 @@ $base-half-leader: $base-leader / 2;
   @return $lines;
 }
 
-// Apply leading whitespace
+// Apply leading whitespace. The $property can be margin or padding.
 @mixin leader($lines: 1, $font-size: $base-font-size, $property: margin) {
-  $leader: rhythm($lines, $font-size);
-  @if unit($leader) == px {
-    $leader: floor($leader)
-  }
-  #{$property}-top: $leader;
+  #{$property}-top: rhythm($lines, $font-size);
 }
 
-// Apply leading whitespace as padding
+// Apply leading whitespace as padding.
 @mixin padding-leader($lines: 1, $font-size: $base-font-size) {
-  @include leader($lines, $font-size, padding);
+  padding-top: rhythm($lines, $font-size);
 }
 
-// Apply leading whitespace as margin
+// Apply leading whitespace as margin.
 @mixin margin-leader($lines: 1, $font-size: $base-font-size) {
-  @include leader($lines, $font-size, margin);
+  margin-top: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace
+// Apply trailing whitespace. The $property can be margin or padding.
 @mixin trailer($lines: 1, $font-size: $base-font-size, $property: margin) {
-  $leader: rhythm($lines, $font-size);
-  @if unit($leader) == px {
-    $leader: ceil($leader)
-  }
-  #{$property}-bottom: $leader;
+  #{$property}-bottom: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace as padding
+// Apply trailing whitespace as padding.
 @mixin padding-trailer($lines: 1, $font-size: $base-font-size) {
-  @include trailer($lines, $font-size, padding);
+  padding-bottom: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace as margin
+// Apply trailing whitespace as margin.
 @mixin margin-trailer($lines: 1, $font-size: $base-font-size) {
-  @include trailer($lines, $font-size, margin);
+  margin-bottom: rhythm($lines, $font-size);
 }
 
-// Whitespace application shortcut
-// Apply top margin/padding + bottom padding/margin
+// Shorthand mixin to apply whitespace for top and bottom margins and padding.
 @mixin rhythm($leader: 0, $padding-leader: 0, $padding-trailer: 0, $trailer: 0, $font-size: $base-font-size) {
   @include leader($leader, $font-size);
   @include padding-leader($padding-leader, $font-size);
@@ -169,8 +174,8 @@ $base-half-leader: $base-leader / 2;
   @include trailer($trailer, $font-size);
 }
 
-// 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.
+// Apply a border and whitespace to any side without destroying the vertical
+// rhythm. The whitespace must be greater than the width of the 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";
@@ -179,36 +184,38 @@ $base-half-leader: $base-leader / 2;
     style: $border-style;
     width: $font-unit * $width / $font-size;
   };
-  padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width);
+  padding-#{$side}: rhythm($lines, $font-size, $offset: $width);
 }
 
-// Aplly rhythm borders equally to all sides
+// Apply borders and whitespace equally to all sides.
 @mixin rhythm-borders($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 rhythm-borders";
   }
   border: {
     style: $border-style;
-    width: $font-unit * $width / $font-size; };
-  padding: $font-unit / $font-size * ($lines * $base-line-height - $width);
+    width: $font-unit * $width / $font-size;
+  };
+  padding: rhythm($lines, $font-size, $offset: $width);
 }
 
-// Apply a leading rhythm border
+// Apply a leading border.
 @mixin leading-border($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include apply-side-rhythm-border(top, $width, $lines, $font-size, $border-style);
 }
 
-// Apply a trailing rhythm border
+// Apply a trailing border.
 @mixin trailing-border($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include apply-side-rhythm-border(bottom, $width, $lines, $font-size, $border-style);
 }
 
-// Apply both leading and trailing rhythm borders
+// Apply both leading and trailing borders.
 @mixin horizontal-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include leading-border($width, $lines, $font-size, $border-style);
   @include trailing-border($width, $lines, $font-size, $border-style);
 }
 
+// Alias for `horizontal-borders` mixin.
 @mixin h-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include horizontal-borders($width, $lines, $font-size, $border-style);
 }

data/frameworks/compass/stylesheets/compass/typography/text/_replacement.scss

@@ -1,16 +1,27 @@
+// Indicates the direction you prefer to move your text
+// when hiding it.
+//
+// `left` is more robust, especially in older browsers.
+// `right` seems have better runtime performance.
+$hide-text-direction: left !default;
+
 // Hides html text and replaces it with an image.
 // If you use this on an inline element, you will need to change the display to block or inline-block.
 // Also, if the size of the image differs significantly from the font size, you'll need to set the width and/or height.
 //
 // Parameters:
 //
-// * `img` -- the relative path from the project image directory to the image.
+// * `img` -- the relative path from the project image directory to the image, or a url literal.
 // * `x` -- the x position of the background image.
 // * `y` -- the y position of the background image.
 @mixin replace-text($img, $x: 50%, $y: 50%) {
   @include hide-text;
   background: {
-    image: image-url($img);
+    @if is-url($img) {
+      image: $img;
+    } @else {
+      image: image-url($img);
+    }
     repeat: no-repeat;
     position: $x $y;
   };
@@ -18,18 +29,33 @@
 
 // Like the `replace-text` mixin, but also sets the width
 // and height of the element according the dimensions of the image.
-@mixin replace-text-with-dimensions($img, $x: 50%, $y: 50%) {
-  @include replace-text($img, $x, $y);
+//
+// If you set `$inline` to true, then an inline image (data uri) will be used.
+@mixin replace-text-with-dimensions($img, $x: 50%, $y: 50%, $inline: false) {
+  @include replace-text(if($inline, inline-image($img), $img), $x, $y);
   width: image-width($img);
   height: image-height($img);
 }
 
 // Hides text in an element so you can see the background.
-@mixin hide-text {
-  // slightly wider than the box prevents issues with inline-block elements
-  text-indent: 110%;
-  white-space: nowrap;
-  overflow: hidden;
+//
+// The direction indicates how the text should be moved out of view.
+//
+// See `$hide-text-direction` for more information and to set this globally
+// for your application.
+@mixin hide-text($direction: $hide-text-direction) {
+  @if $direction == left {
+    $approximate-em-value: 12px / 1em;
+    $wider-than-any-screen: -9999em;
+    text-indent: $wider-than-any-screen * $approximate-em-value;
+    overflow: hidden;
+    text-align: left;
+  } @else {
+    // slightly wider than the box prevents issues with inline-block elements
+    text-indent: 110%;
+    white-space: nowrap;
+    overflow: hidden;
+  }
 }
 
 // Hides text in an element by squishing the text into oblivion.

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

@@ -22,7 +22,7 @@ $default-has-layout-approach: zoom !default;
 }
 
 @mixin has-layout-zoom {
-  @if $legacy-support-for-ie {
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
     *zoom: 1;
   }
 }

data/lib/compass/actions.rb

@@ -10,7 +10,11 @@ module Compass
     # copy/process a template in the compass template directory to the project directory.
     def copy(from, to, options = nil, binary = false)
       options ||= self.options if self.respond_to?(:options)
-      contents = File.new(from).read
+      if binary
+        contents = File.new(from,"rb").read
+      else
+        contents = File.new(from).read
+      end  
       write_file to, contents, options, binary
     end
 
@@ -51,9 +55,7 @@ module Compass
       if skip_write
         FileUtils.touch file_name unless options[:dry_run]
       else
-        mode = "w"
-        mode << "b" if binary
-        open(file_name, mode) do |file|
+        Sass::Util.atomic_create_and_write_file(file_name) do |file|
           file.write(contents)
         end
       end

data/lib/compass/commands.rb

@@ -4,8 +4,9 @@ end
 require 'compass/commands/registry'
 
 %w(base generate_grid_background default help list_frameworks project_base
-   update_project watch_project create_project clean_project imports installer_command
-   print_version project_stats stamp_pattern sprite validate_project
-   write_configuration interactive unpack_extension).each do |lib|
+   update_project watch_project create_project clean_project extension_command
+   imports installer_command print_version project_stats stamp_pattern
+   sprite validate_project write_configuration interactive unpack_extension
+).each do |lib|
   require "compass/commands/#{lib}"
 end

data/lib/compass/commands/extension_command.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+require 'compass/commands/base'
+
+module Compass
+  module Commands
+    module ExtensionsOptionParser
+      def set_options(opts)
+        opts.banner = %Q{
+Usage: compass extension install EXTENSION_NAME [options]
+       compass extension uninstall EXTENSION_NAME [options]
+       compass extension list
+
+Description:
+  Manage the list of extensions on your system.
+  Compass to all of your compass projects.
+
+Example:
+  compass extension install sassy-buttons
+  compass extension uninstall sassy-buttons
+
+}
+        super
+      end
+    end
+
+    class ExtensionCommand < Base
+
+      register :extension
+
+      class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(ExtensionsOptionParser)
+        end
+        def usage
+          option_parser([]).to_s
+        end
+        def description(command)
+          "Manage the list of compass extensions on your system"
+        end
+        def parse!(arguments)
+          {:arguments => arguments}
+        end
+      end
+      include InstallerCommand
+
+      def initialize(working_path, options)
+        super(working_path, options)
+      end
+
+      # all commands must implement perform
+      def perform
+        require 'rubygems/gem_runner'
+        Gem::GemRunner.new.run(options[:arguments])
+      end
+
+    end
+  end
+end
+