compass 0.10.0.rc4 → 0.10.0.rc5

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

@@ -1,122 +1,2 @@
-// Based on Eric Meyer's reset http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
-
-// Global reset rules.
-// For more specific resets, use the reset mixins provided below
-@mixin global-reset {
-  html, body, div, span, applet, object, iframe,
-  h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-  a, abbr, acronym, address, big, cite, code,
-  del, dfn, em, font, img, ins, kbd, q, s, samp,
-  small, strike, strong, sub, sup, tt, var,
-  dl, dt, dd, ol, ul, li,
-  fieldset, form, label, legend,
-  table, caption, tbody, tfoot, thead, tr, th, td {
-    @include reset-box-model;
-    @include reset-font; }
-  *:focus {
-    @include reset-focus; }
-  body {
-    @include reset-body; }
-  ol, ul {
-    @include reset-list-style; }
-  /* tables still need 'cellspacing="0"' in the markup */
-  table {
-    @include reset-table; }
-  caption, th, td {
-    @include reset-table-cell; }
-  q, blockquote {
-    @include reset-quotation; }
-  a img {
-    @include reset-image-anchor-border; } }
-
-// 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 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 reset-box-model;
-    @include reset-font; }
-  /* tables still need 'cellspacing="0"' in the markup */
-  table {
-    @include reset-table; }
-  caption, th, td {
-    @include reset-table-cell; }
-  q, blockquote {
-    @include reset-quotation; }
-  a img {
-    @include reset-image-anchor-border; } }
-
-//Mixins partials
-@mixin reset-box-model {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0; }
-
-@mixin reset-font {
-  font: {
-    weight: inherit;
-    style: inherit;
-    size: 100%;
-    family: inherit; };
-  vertical-align: baseline; }
-
-@mixin reset-focus {
-  outline: 0; }
-
-@mixin reset-body {
-  line-height: 1;
-  color: black;
-  background: white; }
-
-@mixin reset-list-style {
-  list-style: none; }
-
-@mixin reset-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle; }
-
-@mixin reset-table-cell {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle; }
-
-@mixin reset-quotation {
-  quotes: "" "";
-  &:before, &:after {
-    content: ""; } }
-
-@mixin reset-image-anchor-border {
-  border: none; }
-
-@mixin reset-html5 {
-  section, article, aside, header, footer, nav, dialog, figure {
-    display: block; } }
-
-//**
-// Resets the display of inline and block elements to their default display
-// according to their tag type. Elements that have a default display that varies across
-// versions of html or browser are not handled here, but this covers the 90% use case.
-// Usage Example:
-//   // Turn off the display for both of these classes
-//   .unregistered-only, .registered-only
-//     display: none
-//   // Now turn only one of them back on depending on some other context.
-//   body.registered
-//     +reset-display(".registered-only")
-//   body.unregistered
-//     +reset-display(".unregistered-only")
-@mixin reset-display($selector: "", $important: false) {
-  #{append-selector(elements-of-type("inline"), $selector)} {
-    @if $important {
-      display: inline !important; }
-    @else {
-      display: inline; } }
-  #{append-selector(elements-of-type("block"), $selector)} {
-    @if $important {
-      display: block !important; }
-    @else {
-      display: block; } } }
+// This module has moved.
+@import "compass/reset/utilities";

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

@@ -28,7 +28,7 @@
   margin-left: 0;
   li {
     padding-left: $padding;
-    background: image-url($bullet-icon) no-repeat 0 + ($padding - $width) / 2 ($line-height - $height) / 2;
+    background: image-url($bullet-icon) no-repeat ($padding - $width) / 2 ($line-height - $height) / 2;
     list-style-type: none;
   }
 }

data/frameworks/compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss

@@ -1,20 +1,20 @@
 @mixin alternating-rows-and-columns($even-row-color, $odd-row-color, $dark-intersection, $header-color: white, $footer-color: white) {
   th {
     background-color: $header-color;
-    &.even {
+    &.even, &:nth-child(2n) {
       background-color: $header-color - $dark-intersection; } }
   tr.odd {
     td {
       background-color: $odd-row-color;
-      &.even {
+      &.even, &:nth-child(2n) {
         background-color: $odd-row-color - $dark-intersection; } } }
   tr.even {
     td {
       background-color: $even-row-color;
-      &.even {
+      &.even, &:nth-child(2n) {
         background-color: $even-row-color - $dark-intersection; } } }
   tfoot {
     th, td {
       background-color: $footer-color;
-      &.even {
+      &.even, &:nth-child(2n) {
         background-color: $footer-color - $dark-intersection; } } } }

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

@@ -1,12 +1,25 @@
-// This technique, by [Justin Maxwell](http://code404.com/), was originally
-// published at http://mattsnider.com/css/css-string-truncation-with-ellipsis/
-// Firefox implementation by [Rikkert Koppes](http://www.rikkertkoppes.com/thoughts/2008/6/)
+@import "compass/css3/shared";
+
+// To get firefox2 support, you must install the ellipsis pattern:
+//
+//     compass install compass/ellipsis
+$firefox2-ellipsis: false !default;
 
+// This technique, by [Justin Maxwell](http://code404.com/), was originally
+// published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
+// Firefox implementation by [Rikkert Koppes](http://www.rikkertkoppes.com/thoughts/2008/6/).
 @mixin ellipsis($no-wrap: true) {
-  @if $no-wrap {
-    white-space: nowrap; }
+  @if $no-wrap { white-space: nowrap; }
   overflow: hidden;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
-  -ms-text-overflow: ellipsis;
-  -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis")); }
+  @include experimental(text-overflow, ellipsis,
+    not -moz,
+    not -webkit,
+    -o,
+    -ms,
+    not -khtml,
+    official
+  );
+  @if $experimental-support-for-mozilla and $firefox2-ellipsis {
+    -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));    
+  }
+}

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

@@ -1,3 +1,2 @@
 // When remembering whether or not there's a hyphen in white-space is too hard
-@mixin nowrap {
-  white-space: nowrap; }
+@mixin nowrap { white-space: nowrap; }

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

@@ -1,21 +1,32 @@
 // 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.
-// @param img
-//   the relative path from the project image directory to the image.
-// @param x
-//   the x position of the background image.
-// @param y
-//   the y position of the background image.
+//
+// Parameters:
+//
+// * `img` -- the relative path from the project image directory to the image.
+// * `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);
     repeat: no-repeat;
-    position: $x $y; }; }
+    position: $x $y;
+  };
+}
+
+// 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);
+  width: image-width($img);
+  height: image-height($img);
+}
 
 // Hides text in an element so you can see the background.
 @mixin hide-text {
   text-indent: -9999em;
   overflow: hidden;
-  text-align: left; }
+  text-align: left;
+}

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

@@ -1,3 +1,6 @@
+// Since you've installed the xml file, you must set
+// $firefox2-ellipsis to true before importing.
+$firefox2-ellipsis: 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/lib/compass.rb

@@ -6,13 +6,6 @@ end
 end
 
 module Compass
-  extend Compass::Version
-  def self.const_missing(const)
-    # This avoid reading from disk unless the VERSION is requested.
-    if const == :VERSION
-      version[:string]
-    end
-  end
   def base_directory
     File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end

data/lib/compass/app_integration/rails/configuration_defaults.rb

@@ -36,7 +36,7 @@ module Compass
         end
 
         def default_extensions_dir
-          File.join("vendor", "plugins", "compass", "extensions")
+          File.join("vendor", "plugins", "compass_extensions")
         end
 
         def default_cache_dir

data/lib/compass/app_integration/rails/templates/compass-install-rails.rb

@@ -43,8 +43,7 @@ puts "==================================================="
 puts
 
 # css framework prompt
-css_framework = ask("What CSS Framework do you want to use with Compass? (default: 'blueprint')")
-css_framework = "blueprint" if css_framework.blank?
+css_framework = ask("What CSS Framework install do you want to use with Compass?")
 
 # sass storage prompt
 sass_dir = ask("Where would you like to keep your sass files within your project? (default: 'app/stylesheets')")
@@ -55,40 +54,25 @@ css_dir = ask("Where would you like Compass to store your compiled css files? (d
 css_dir = "public/stylesheets/compiled" if css_dir.blank?
 
 # use sudo for gem commands?
-use_sudo = sudo_is_an_option?
+use_sudo = nil
 if sudo_is_an_option? # dont give them the option if they are on a system that can't use sudo (aka windows)
   use_sudo = yes?("Use sudo for the gem commands? (the default for your system is #{sudo_is_an_option? ? 'yes' : 'no'})")
 end
+use_sudo = sudo_is_an_option? if use_sudo.blank?
 
 # define dependencies
-gem "haml", :version => ">=2.2.16"
-gem "compass", :version => ">= 0.8.17"
+gem "haml", :version => ">=3.0.0.rc.3"
+gem "compass", :version => ">= 0.10.0.rc4"
 
 # install and unpack
-rake "gems:install GEM=haml", :sudo => use_sudo
-rake "gems:install GEM=compass", :sudo => use_sudo
-rake "gems:unpack GEM=compass"
-
-# load any compass framework plugins
-if css_framework =~ /960/
-  gem "compass-960-plugin", :lib => "ninesixty"
-  rake "gems:install GEM=compass-960-plugin", :sudo => use_sudo
-  css_framework = "960" # rename for command
-  plugin_require = "-r ninesixty"
-end
+rake "gems:install GEM=haml --trace", :sudo => use_sudo
+rake "gems:install GEM=compass --trace", :sudo => use_sudo
+rake "gems:unpack GEM=compass --trace"
 
 # build out compass command
-compass_command = "compass --rails -f #{css_framework} . --css-dir=#{css_dir} --sass-dir=#{sass_dir} "
-compass_command << plugin_require if plugin_require
-
-# Require compass during plugin loading
-file 'vendor/plugins/compass/init.rb', <<-CODE
-# This is here to make sure that the right version of sass gets loaded (haml 2.2) by the compass requires.
-require 'compass'
-CODE
+compass_command = "compass init rails . --css-dir=#{css_dir} --sass-dir=#{sass_dir} "
+compass_command << "--using #{css_framework} " unless css_framework.blank?
 
 # integrate it!
 run "haml --rails ."
 run compass_command
-
-puts "Compass (with #{css_framework}) is all setup, have fun!"

data/lib/compass/commands/help.rb

@@ -34,7 +34,7 @@ To get help on a particular command please specify the command.
             banner << "\n"
           end
         end
-
+        banner << "\nGlobal Options:\n"
         opts.banner = banner
 
         super

data/lib/compass/commands/project_base.rb

@@ -23,6 +23,7 @@ module Compass
 
       def configure!
         add_project_configuration
+        Compass.add_configuration(options, "cli")
         Compass.discover_extensions!
       end
 

data/lib/compass/commands/update_project.rb

@@ -29,12 +29,15 @@ module Compass
 
       def perform
         compiler = new_compiler_instance
+        check_for_sass_files!(compiler)
+        compiler.run
+      end
+
+      def check_for_sass_files!(compiler)
         if compiler.sass_files.empty? && !dry_run?
           message = "Nothing to compile. If you're trying to start a new project, you have left off the directory argument.\n"
           message << "Run \"compass -h\" to get help."
           raise Compass::Error, message
-        else
-          compiler.run
         end
       end
 

data/lib/compass/commands/watch_project.rb

@@ -36,6 +36,7 @@ module Compass
           exit 0
         end
 
+        check_for_sass_files!(new_compiler_instance)
         recompile
 
         begin

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

@@ -15,7 +15,8 @@ module Compass::SassExtensions::Functions::Display
     :"table-cell" => %w{th td}
   }
 
-  # returns a comma delimited string for all the elements according to their default css3 display value.
+  # returns a comma delimited string for all the
+  # elements according to their default css3 display value.
   def elements_of_type(display)
     Sass::Script::String.new(DEFAULT_DISPLAY.fetch(display.value.to_sym).join(", "))
   end

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

@@ -57,12 +57,19 @@ module Compass::SassExtensions::Functions::GradientSupport
       assert_list(color_list)
       normalize_stops!(color_list)
       max = color_list.values.last.stop
+      last_value = nil
       color_stops = color_list.values.map do |pos|
         # have to convert absolute units to percentages for use in color stop functions.
         stop = pos.stop
         stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units
+        # Make sure the color stops are specified in the right order.
+        if last_value && last_value.value > stop.value
+          raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
+        end
+        last_value = stop
         "color-stop(#{stop.inspect}, #{pos.color.inspect})"
       end
+      
       Sass::Script::String.new(color_stops.join(", "))
     end
 
@@ -185,6 +192,10 @@ module Compass::SassExtensions::Functions::GradientSupport
           pos.stop = pos.stop.times(Sass::Script::Number.new(1, ["px"]))
         end
       end
+      if (positions.last.stop.eq(Sass::Script::Number.new(0, ["px"])).to_bool ||
+         positions.last.stop.eq(Sass::Script::Number.new(0, ["%"])).to_bool)
+         raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
+       end
       nil
     end
     def assert_list(value)

data/lib/compass/version.rb

@@ -45,4 +45,13 @@ module Compass
       end
     end
   end
+  extend Compass::Version
+  def self.const_missing(const)
+    # This avoid reading from disk unless the VERSION is requested.
+    if const == :VERSION
+      version[:string]
+    else
+      super
+    end
+  end
 end

data/test/fixtures/stylesheets/compass/css/reset.css

@@ -16,9 +16,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
   font-family: inherit;
   vertical-align: baseline; }
 
-*:focus {
-  outline: 0; }
-
 body {
   line-height: 1;
   color: black;
@@ -27,7 +24,6 @@ body {
 ol, ul {
   list-style: none; }
 
-/* tables still need 'cellspacing="0"' in the markup */
 table {
   border-collapse: separate;
   border-spacing: 0;