chriseppstein-compass 0.5.5 → 0.5.9

data/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass

@@ -15,7 +15,7 @@
 //  * subtraction.com/archives/2007/0318_oh_yeeaahh.php
 //  --------------------------------------------------------------
 
-@import compass/utilities/general/clearfix.sass
+@import compass/utilities/general/float.sass
 
 // Main layout grid, override these constants to build your grid and container sizes.
 !blueprint_grid_columns ||= 24
@@ -77,12 +77,14 @@
 
 // Use this mixins to set the width of n columns.
 =column(!n, !last = false)
-  :float left
+  +float-left
   +span(!n)
   @if !last
     +last
   @else
     :margin-right = !blueprint_grid_margin
+  * html &
+    :overflow-x hidden
 
 // Mixin to a column to append n empty cols.
 =append(!n)
@@ -94,7 +96,7 @@
 
 // mixin to a column to move it n columns to the left
 =pull(!n, !last = false)
-  :float left
+  +float-left
   :position relative
   @if !last
     :margin-left = (-!blueprint_grid_outer_width * !n) + !blueprint_grid_margin
@@ -103,7 +105,7 @@
 
 // mixin to a column to push it n columns to the right
 =push(!n)
-  :float right
+  +float-right
   :position relative
   :margin
     :top 0

data/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass

@@ -31,7 +31,7 @@
 //  @import blueprint/modules/liquid.sass
 //  -------------------------------------------------------------------
 
-@import compass/utilities/general/clearfix.sass
+@import compass/utilities/general/float.sass
 
 // Main layout grid, override these constants to build your grid and container sizes.
 // The width shown gives the right floored percentage values.
@@ -88,7 +88,7 @@
   :margin-right 0
 
 =column(!n, !last = false)
-  :float left
+  +float-left
   :overflow hidden
   +span(!n)
   @if !last
@@ -106,7 +106,7 @@
   :margin-left= (!blueprint_liquid_grid_push_pull * !n)
 
 =push(!n)
-  :float right
+  +float-right
   :margin
     :top 0
     :left 1.5em

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

@@ -1,5 +1,6 @@
 @import colors.sass
 @import compass/utilities/links/link_colors.sass
+@import compass/utilities/general/float.sass
 
 !blueprint_font_family       ||= "Helvetica Neue, Helvetica, Arial, sans-serif"
 !blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace"
@@ -84,11 +85,11 @@
   p
     :margin 0 0 1.5em
     img
-      :float left
+      +float-left
       :margin 1.5em 1.5em 1.5em 0
       :padding 0
       &.right
-        :float right
+        +float-right
         :margin 1.5em 0 1.5em 1.5em
   a
     :text-decoration underline

data/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass

@@ -1,5 +1,5 @@
 @import compass/utilities/text/nowrap.sass
-@import compass/utilities/general/clearfix.sass
+@import compass/utilities/general/float.sass
 
 // Most of these utility classes are not "semantic". If you use them,
 // you are mixing your content and presentation. For shame!

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

@@ -0,0 +1,49 @@
+@import compass/utilities/general/float.sass
+@import blueprint/modules/buttons.sass
+
+//
+  Use the following HTML code to place the buttons on your site:
+  
+  <button type="submit" class="button positive">
+    <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Save
+  </button>
+  
+  <a class="button" href="/password/reset/">
+    <img src="css/blueprint/plugins/buttons/icons/key.png" alt=""/> Change Password
+  </a>
+  
+  <a href="#" class="button negative">
+    <img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
+  </a>
+
+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")
+  // 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/modules/buttons.sass
+  // the last one defaults to a shade lighter than the border color.
+  +button-colors
+  +button-hover-colors
+  +button-active-colors
+
+button
+  // The +button-button mixin is just like the +anchor-button mixin, but for <button> elements.
+  +button-button("left")
+  +button-colors
+  +button-hover-colors
+  +button-active-colors
+
+// We can change the colors for buttons of certain classes, etc.
+a.positive, button.positive
+  :color #529214
+  +button-hover-colors(#529214, #E6EFC2, #C6D880)
+  +button-active-colors(#FFF, #529214, #529214)
+
+a.negative, button.negative
+  :color #D12F19
+  +button-hover-colors(#D12F19, #FBE3E4, #FBC2C4)
+  +button-active-colors(#FFF, #D12F19, #D12F19)
+

data/frameworks/blueprint/templates/buttons/manifest.rb

@@ -0,0 +1,5 @@
+stylesheet 'buttons.sass', :media => 'screen, projection'
+
+image 'buttons/cross.png'
+image 'buttons/key.png'
+image 'buttons/tick.png'

data/frameworks/compass/stylesheets/compass/utilities/_general.sass

@@ -1,4 +1,6 @@
 @import general/reset.sass
 @import general/clearfix.sass
+@import general/float.sass
 @import general/tag_cloud.sass
 @import general/inline_block.sass
+@import general/hacks.sass

data/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass

@@ -1,11 +1,24 @@
-// Clearing floats without extra markup
-// Simple Clearing of Floats
-// [http://www.sitepoint.com/blogs/2005/02/26/simple-clearing-of-floats/]
+@import hacks.sass
+
+//**
+  Extends the element to enclose any floats it contains.
+  This basic method is preferred for the usual case, when positioned content will not show outside the bounds of the container.
+  Recommendations include using this in conjunction with a width:
+  http://www.quirksmode.org/blog/archives/2005/03/clearing_floats.html
 =clearfix
-  :overflow auto
-  :overflow -moz-scrollbars-none
-  // This makes ie6 get layout
-  :display inline-block
-  // and this puts it back to block
-  &
-    :display block
+  :overflow hidden
+  +has-layout
+
+//**
+  Extends the element to enclose any floats it contains.
+  This older "Easy Clearing" method has the advantage of allowing positioned elements to hang outside the bounds of the container, at the expense of more tricky CSS.
+  http://www.positioniseverything.net/easyclearing.html
+=pie-clearfix
+  &:after
+    :content " "
+    :display block
+    :height 0
+    :clear both
+    :overflow hidden
+    :visibility hidden
+  +has-layout

data/frameworks/compass/stylesheets/compass/utilities/general/_float.sass

@@ -0,0 +1,17 @@
+//**\\
+  Float
+
+@import clearfix.sass
+
+// Implementation of float:left with fix for double-margin bug
+=float-left
+  +float("left")
+
+// Implementation of float:right with fix for double-margin bug
+=float-right
+  +float("right")
+
+// Available as alternate syntax with just +float
+=float(!side = "left")
+  :display inline
+  :float= !side

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

@@ -0,0 +1,6 @@
+=has-layout
+  // This makes ie6 get layout
+  :display inline-block
+  // and this puts it back to block
+  &
+    :display block

data/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass

@@ -1,6 +1,6 @@
 @import bullets.sass
 @import compass/utilities/general/reset.sass
-@import compass/utilities/general/clearfix.sass
+@import compass/utilities/general/float.sass
 
 // A list(ol,ul) that is layed out such that the elements are floated left and won't wrap.
 // This is not an inline list.
@@ -10,7 +10,7 @@
   li
     +no-bullet
     :white-space nowrap
-    :float left
+    +float-left
     :padding
       :left= !padding
       :right= !padding

data/frameworks/yui/stylesheets/yui/modules/_grids.sass

@@ -1,7 +1,7 @@
 // This is a port of YUI Grids version 2.6.0
 // Note: This is not really tested yet. Use at your own risk.
 
-@import compass/utilities/general/clearfix.sass
+@import compass/utilities/general/float.sass
 @import fonts.sass
 
 =yui-grids

data/lib/compass/actions.rb

@@ -25,7 +25,7 @@ module Compass
       else
         logger.record :directory, separate("#{basename(dir)}/")
         FileUtils.mkdir_p(dir) unless options[:dry_run]
-      end          
+      end
     end
 
     # Write a file given the file contents as a string
@@ -53,7 +53,6 @@ module Compass
 
     # Compile one Sass file
     def compile(sass_filename, css_filename, options)
-      puts options.inspect
       logger.record :compile, basename(sass_filename)
       engine = ::Sass::Engine.new(open(sass_filename).read,
                                   :filename => sass_filename,
@@ -68,7 +67,7 @@ module Compass
     def basename(file)
       relativize(file) {|f| File.basename(file)}
     end
-    
+
     def relativize(path)
       if path.index(working_path+File::SEPARATOR) == 0
         path[(working_path+File::SEPARATOR).length..-1]

data/lib/compass/commands/create_project.rb

@@ -1,39 +1,18 @@
 require 'fileutils'
-require File.join(File.dirname(__FILE__), 'base')
+require File.join(File.dirname(__FILE__), 'stamp_pattern')
 require File.join(File.dirname(__FILE__), 'update_project')
 require File.join(Compass.lib_directory, 'compass', 'installers')
 
 module Compass
   module Commands
-    class CreateProject < ProjectBase
-
-      include Compass::Installers
-
-      attr_accessor :installer
+    class CreateProject < StampPattern
 
       def initialize(working_path, options)
-        super(working_path, options)
-        installer_args = [project_template_directory, project_directory, self.options]
-        @installer = case options[:project_type]
-        when :stand_alone
-          StandAloneInstaller.new *installer_args
-        when :rails
-          RailsInstaller.new *installer_args
-        else
-          raise "Unknown project type: #{project_type}"
-        end
-      end
-      
-      # all commands must implement perform
-      def perform
-        installer.init
-        installer.run(:skip_finalization => true)
-        UpdateProject.new(working_path, options).perform if installer.compilation_required?
-        installer.finalize(:create => true)
+        super(working_path, options.merge(:pattern => "project", :pattern_name => nil))
       end
 
-      def project_template_directory
-        File.join(framework.templates_directory, "project")
+      def is_project_creation?
+        true
       end
 
     end

data/lib/compass/commands/generate_grid_background.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), 'project_base')
+require File.join(File.dirname(__FILE__), 'update_project')
+require File.join(File.dirname(__FILE__), '..', 'grid_builder')
+
+module Compass
+  module Commands
+    class GenerateGridBackground < ProjectBase
+      include Actions
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        read_project_configuration
+        Compass.configuration.set_maybe(options)
+        Compass.configuration.set_defaults!
+        column_width, gutter_width = options[:grid_dimensions].split(/\+/).map{|d| d.to_i}
+        unless GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :output_path => projectize(project_images_subdirectory), :working_path => self.working_path)).generate!
+          puts "ERROR: Some library dependencies appear to be missing."
+          puts "Have you installed rmagick? If not, please run:"
+          puts "sudo gem install rmagick"
+        end
+      end
+    end
+  end
+end

data/lib/compass/commands/project_base.rb

@@ -33,6 +33,10 @@ module Compass
         Compass.configuration.sass_dir
       end
 
+      def project_images_subdirectory
+        Compass.configuration.images_dir
+      end
+
       # Read the configuration file for this project
       def read_project_configuration
         if File.exists?(projectize('config.rb'))

data/lib/compass/commands/stamp_pattern.rb

@@ -0,0 +1,45 @@
+require 'fileutils'
+require File.join(File.dirname(__FILE__), 'base')
+require File.join(File.dirname(__FILE__), 'update_project')
+require File.join(Compass.lib_directory, 'compass', 'installers')
+
+module Compass
+  module Commands
+    class StampPattern < ProjectBase
+
+      include Compass::Installers
+
+      attr_accessor :installer
+
+      def initialize(working_path, options)
+        super(working_path, options)
+        installer_args = [template_directory(options[:pattern]), project_directory, self.options]
+        @installer = case options[:project_type]
+        when :stand_alone
+          StandAloneInstaller.new *installer_args
+        when :rails
+          RailsInstaller.new *installer_args
+        else
+          raise "Unknown project type: #{project_type}"
+        end
+      end
+      
+      # all commands must implement perform
+      def perform
+        installer.init
+        installer.run(:skip_finalization => true)
+        UpdateProject.new(working_path, options).perform if installer.compilation_required?
+        installer.finalize(:create => is_project_creation?)
+      end
+
+      def is_project_creation?
+        false
+      end
+
+      def template_directory(pattern)
+        File.join(framework.templates_directory, pattern)
+      end
+
+    end
+  end
+end

data/lib/compass/commands/validate_project.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), 'project_base')
+require File.join(File.dirname(__FILE__), 'update_project')
+require File.join(File.dirname(__FILE__), '..', 'validator')
+
+module Compass
+  module Commands
+    class ValidateProject < ProjectBase
+      
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        UpdateProject.new(working_path, options).perform
+        Validator.new(project_css_subdirectory).validate()
+      end
+
+    end
+  end
+end

data/lib/compass/configuration.rb

@@ -73,6 +73,10 @@ module Compass
       "stylesheets"
     end
 
+    def default_images_dir
+      "images"
+    end
+
     def default_output_style
       if environment == :development
         :expanded