chriseppstein-compass 0.6.15 → 0.7.0

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

@@ -0,0 +1,56 @@
+// Global reset rules.
+// For more specific resets, use the reset mixins provided below
+=blueprint-global-reset
+  html, body
+    +blueprint-reset
+  +blueprint-nested-reset
+
+// 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.
+=blueprint-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
+    +blueprint-reset
+  blockquote, q
+    +blueprint-reset-quotation
+  th, td, caption
+    +blueprint-reset-table-cell
+  table
+    +blueprint-reset-table
+  a img
+    :border none
+
+=blueprint-reset-box-model
+  :margin 0
+  :padding 0
+  :border 0
+
+=blueprint-reset
+  +blueprint-reset-box-model
+  :font
+    :weight inherit
+    :style inherit
+    :size 100%
+    :family inherit
+  :vertical-align baseline
+
+=blueprint-reset-quotation
+  +blueprint-reset
+  :quotes "" ""
+  &:before,
+  &:after
+    :content ""
+
+=blueprint-reset-table-cell
+  +blueprint-reset
+  :text-align left
+  :font-weight normal
+  :vertical-align middle
+
+=blueprint-reset-table
+  +blueprint-reset
+  :border-collapse separate
+  :border-spacing 0
+  :vertical-align middle

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

@@ -66,8 +66,8 @@
 
 // Border with more whitespace, spans one column.
 =colborder
-  :padding-left= !blueprint_grid_width - 0.5 * !blueprint_grid_margin - 1
-  :margin-left= !blueprint_grid_width - 0.5 * !blueprint_grid_margin
+  :padding-left= (!blueprint_grid_width - 2 * !blueprint_grid_margin - 1)/2
+  :margin-left= (!blueprint_grid_width - 2 * !blueprint_grid_margin)/2
   :border-left 1px solid #eee
 
 =rtl-typography(!body_selector = "body")

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

@@ -16,12 +16,13 @@
 
 =blueprint-scaffolding(!body_selector = "body")
   #{!body_selector}
-    +blueprint-scaffolding-body
     @if !body_selector != "body"
       +blueprint-scaffolding-defaults
   @if !body_selector == "body"
     +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.
 =blueprint-scaffolding-body
   :margin 1.5em 0
 

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

@@ -4,6 +4,7 @@
 
 !blueprint_font_family       ||= "Helvetica Neue, Arial, Helvetica, sans-serif"
 !blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace"
+!blueprint_font_size         ||= 12px
 
 // The +blueprint-typography mixin must be mixed into the top level of your stylesheet.
 // However, you can customize the body selector if you wish to control the scope
@@ -43,10 +44,10 @@
 =loud
   :color= !loud_color
 
-=blueprint-typography-body
+=blueprint-typography-body(!font_size = !blueprint_font_size)
   :line-height 1.5
   +normal-text
-  :font-size 75%
+  :font-size= 100% * !font_size / 16px
 
 =blueprint-typography-defaults
   h1

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

@@ -1,5 +1,6 @@
 stylesheet 'screen.sass', :media => 'screen, projection'
+stylesheet 'partials/_base.sass'
 stylesheet 'print.sass',  :media => 'print'
-stylesheet 'ie.sass',     :media => 'screen, projection', :ie => true
+stylesheet 'ie.sass',     :media => 'screen, projection', :condition => "lt IE 8"
 
 image 'grid.png'

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

@@ -0,0 +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
+
+// 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
+

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

@@ -1,8 +1,40 @@
-@import blueprint.sass
+// This import applies a global reset to any page that imports this stylesheet.
+@import blueprint/reset.sass
+// To configure blueprint, edit the partials/base.sass file.
+@import partials/base.sass
+// Import all the default blueprint modules so that we can access their mixins.
+@import blueprint
+// Import the non-default scaffolding module.
 @import blueprint/modules/scaffolding.sass
-@import compass/reset.sass
 
-+blueprint
-// Remove the scaffolding when you're ready to start doing visual design.
-// Or leave it in if you're happy with how blueprint looks out-of-the-box
-+blueprint-scaffolding
+// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
+// +blueprint
+
+//Recommended Blueprint configuration with scoping and semantic layout:
+body.bp
+  +blueprint-typography
+  +blueprint-utilities
+  +blueprint-debug
+  +blueprint-interaction
+  // Remove the scaffolding when you're ready to start doing visual design.
+  // Or leave it in if you're happy with how blueprint looks out-of-the-box
+  +blueprint-scaffolding
+form.bp
+  +blueprint-form
+
+// Page layout can be done using mixins applied to your semantic classes and IDs:
+body.three-col
+  #container
+    +container
+  #header, #footer
+    +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)
+  #content
+    // Two thirds of the grid columns, rounding up.
+    // With 24 cols, this is 16.
+    !content_columns = ceil(2 * !blueprint_grid_columns / 3)
+    // true means it's the last column in the row
+    +column(!content_columns, true)

data/frameworks/compass/stylesheets/compass/_utilities.sass

@@ -1,5 +1,6 @@
 @import utilities/general.sass
 @import utilities/links.sass
 @import utilities/lists.sass
+@import utilities/sprites.sass
 @import utilities/tables.sass
 @import utilities/text.sass

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

@@ -0,0 +1 @@
+@import sprites/sprite_img.sass

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

@@ -1,10 +1,42 @@
+// 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
 =global-reset
-  html, body
-    +reset
-  +nested-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
+    +reset-box-model
+    +reset-font
+  
+  *:focus
+    +reset-focus
+  
+  body
+    +reset-body
+    
+  ol, ul
+    +reset-list-style
 
+  /* tables still need 'cellspacing="0"' in the markup 
+  table
+    +reset-table
+  
+  caption, th, td
+    +reset-table-cell
+  
+  q, blockquote
+    +reset-quotation
+    
+  img a
+    +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.
@@ -12,45 +44,91 @@
   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
-    +reset
-  blockquote, q
-    +reset-quotation
-  th, td, caption
-    +reset-table-cell
+    +reset-box-model
+    +reset-font
+
+  /* tables still need 'cellspacing="0"' in the markup 
   table
     +reset-table
-  a img
-    :border none
-
+  
+  caption, th, td
+    +reset-table-cell
+  
+  q, blockquote
+    +reset-quotation
+  
+  img a
+    +reset-image-anchor-border
+ 
+//Mixins partials
 =reset-box-model
   :margin 0
   :padding 0
   :border 0
-
-=reset
-  +reset-box-model
+  :outline 0
+ 
+=reset-font
   :font
     :weight inherit
     :style inherit
     :size 100%
     :family inherit
   :vertical-align baseline
-
-=reset-quotation
-  +reset
-  :quotes "" ""
-  &:before,
-  &:after
-    :content ""
-
+ 
+=reset-focus
+  :outline 0
+ 
+=reset-body
+  :line-height 1em
+  :color = #000
+  :background #fff
+ 
+=reset-list-style
+  :list-style none
+ 
+=reset-table
+  :border-collapse separate
+  :border-spacing 0
+  :vertical-align middle
+ 
 =reset-table-cell
-  +reset
   :text-align left
   :font-weight normal
   :vertical-align middle
+ 
+=reset-quotation
+  :quotes "" ""
+  &:before, &:after
+    :content ""
+ 
+=reset-image-anchor-border
+  :border none
 
-=reset-table
-  +reset
-  :border-collapse separate
-  :border-spacing 0
-  :vertical-align middle
+=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")
+=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

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

@@ -3,7 +3,7 @@
   :font-size= !base_size
   :line-height= 1.2 * !base_size
   .xxs, .xs, .s, .l, .xl, .xxl
-    :line-height 1.2 !base_size
+    :line-height= 1.2 * !base_size
   .xxs
     :font-size= !base_size / 2.0
   .xs

data/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass

@@ -0,0 +1,12 @@
+!sprite_image_default_width  ||= 32px
+!sprite_image_default_height ||= 32px
+!sprite_image_default_margin ||= 0px
+
+// Simplest use: +sprite-img("icons-32.png", 1)
+=sprite-img(!img, !col, !row = 1, !width = !sprite_image_default_width, !height = !sprite_image_default_height, !margin = !sprite_image_default_margin)
+  !x = ((!col - 1) * -!height) - ((!col - 1) * !margin)
+  !y = ((!row - 1) * -!width) - ((!row - 1) * !margin)
+  :background= image_url(!img) "no-repeat" !x !y
+  :width= !width
+  :height= !height
+  :overflow hidden

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

@@ -1,6 +1,13 @@
-// 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.
+//
+  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.
 =replace-text( !img, !x = 50%, !y = 50% )
   :text-indent -9999em
   :overflow    hidden

data/frameworks/compass/templates/project/manifest.rb

@@ -1,3 +1,3 @@
 stylesheet 'screen.sass', :media => 'screen, projection'
 stylesheet 'print.sass',  :media => 'print'
-stylesheet 'ie.sass',     :media => 'screen, projection', :ie => true
+stylesheet 'ie.sass',     :media => 'screen, projection', :condition => "IE"

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

@@ -5,3 +5,9 @@
   <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
 
 @import compass/reset.sass
+
+/*
+  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/actions.rb

@@ -73,6 +73,13 @@ module Compass
       end
     end
 
+    def remove(file_name)
+      if File.exists?(file_name)
+        File.unlink file_name
+        logger.record :remove, basename(file_name)
+      end
+    end
+
     def basename(file)
       relativize(file) {|f| File.basename(file)}
     end

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

@@ -0,0 +1,15 @@
+# :stopdoc:
+module ActionController
+  class Base
+    def process_with_compass(*args)
+      Sass::Plugin.rails_controller = self
+      begin
+        process_without_compass(*args)
+      ensure
+        Sass::Plugin.rails_controller = nil
+      end
+    end
+    alias_method_chain :process, :compass
+  end
+end
+# :startdoc:

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

@@ -0,0 +1,14 @@
+module Compass::SassExtensions::Functions::ImageUrl
+  def image_url_with_rails_integration(path)
+    if @controller = Sass::Plugin.rails_controller
+      begin
+        Sass::Script::String.new "url(#{image_path(path.value)})"
+      ensure
+        @controller = nil
+      end
+    else
+      image_url_without_rails_integration(path)
+    end
+  end
+  alias_method_chain :image_url, :rails_integration
+end

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

@@ -0,0 +1,5 @@
+module Sass::Plugin
+  class << self
+    attr_accessor :rails_controller
+  end
+end

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

@@ -0,0 +1,80 @@
+# =================================================================
+# Compass Ruby on Rails Installer (template) v.1.0
+# written by Derek Perez (derek@derekperez.com)
+# -----------------------------------------------------------------
+# NOTE: This installer is designed to work as a Rails template, 
+# and can only be used with Rails 2.3+.
+# -----------------------------------------------------------------
+# Copyright (c) 2009 Derek Perez
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+# =================================================================
+puts "==================================================="
+puts "Welcome to the Compass Installer for Ruby on Rails!"
+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?
+
+# sass storage prompt
+sass_dir = ask("Where would you like to keep your sass files within your project? (default: 'app/stylesheets')")
+sass_dir = "app/stylesheets" if sass_dir.blank?
+
+# compiled css storage prompt
+css_dir = ask("Where would you like Compass to store your compiled css files? (default: 'public/stylesheets/compiled')")
+css_dir = "public/stylesheets/compiled" if css_dir.blank?
+
+# define dependencies
+gem "haml-edge", :lib => "haml"
+gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass"
+
+# install and unpack
+rake "gems:install GEM=haml-edge", :sudo => true
+rake "gems:install GEM=chriseppstein-compass", :sudo => true
+rake "gems:unpack GEM=chriseppstein-compass"
+
+# load any compass framework plugins
+if css_framework =~ /960/
+  gem "chriseppstein-compass-960-plugin", :source => "http://gems.github.com", :lib => "ninesixty"
+  rake "gems:install GEM=chriseppstein-compass-960-plugin", :sudo => true
+  rake "gems:unpack GEM=chriseppstein-compass-960-plugin"
+  css_framework = "960" # rename for command
+  plugin_require = "-r ninesixty"
+end
+
+# 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-edge) by the compass requires.
+require 'compass'
+CODE
+
+# integrate it!
+run "haml --rails ."
+run compass_command
+
+puts "Compass (with #{css_framework}) is all setup, have fun!"

data/lib/compass/app_integration/rails.rb

@@ -0,0 +1,12 @@
+unless defined?(Compass::RAILS_LOADED)
+  Compass::RAILS_LOADED = true
+  require File.join(File.dirname(__FILE__), 'rails', 'action_controller')
+  require File.join(File.dirname(__FILE__), 'rails', 'sass_plugin')
+  require File.join(File.dirname(__FILE__), 'rails', 'image_url')
+  # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
+  class Sass::Script::Functions::EvaluationContext
+    include Sass::Script::Functions
+    private
+    include ActionView::Helpers::AssetTagHelper
+  end
+end

data/lib/compass/app_integration.rb

@@ -0,0 +1,5 @@
+# If we're running inside Rails
+require File.join(File.dirname(__FILE__), 'app_integration', 'rails') if defined?(ActionController::Base)
+
+# If we're running inside Merb
+require File.join(File.dirname(__FILE__), 'app_integration', 'merb') if defined?(Merb::Plugins)

data/lib/compass/commands/project_base.rb

@@ -50,15 +50,25 @@ module Compass
       # Read the configuration file for this project
       def read_project_configuration
         if file = detect_configuration_file
-          Compass.configuration.parse(file)
+          Compass.configuration.parse(file) if File.readable?(file)
         end
       end
 
+      def explicit_config_file_must_be_readable?
+        true
+      end
+
       # TODO: Deprecate the src/config.rb location.
-      KNOWN_CONFIG_LOCATIONS = ["config/compass.config", "config.rb", "src/config.rb"]
+      KNOWN_CONFIG_LOCATIONS = [".compass/config.rb", "config/compass.config", "config.rb", "src/config.rb"]
 
       # Finds the configuration file, if it exists in a known location.
       def detect_configuration_file
+        if options[:configuration_file]
+          if explicit_config_file_must_be_readable? && !File.readable?(options[:configuration_file])
+            raise Compass::Error, "Configuration file, #{file}, not found or not readable."
+          end
+          return options[:configuration_file]
+        end
         KNOWN_CONFIG_LOCATIONS.map{|f| projectize(f)}.detect{|f| File.exists?(f)}
       end
 

data/lib/compass/commands/update_project.rb

@@ -11,12 +11,22 @@ module Compass
       end
 
       def perform
-        compiler = Compass::Compiler.new(working_path,
+        compiler = new_compiler_instance
+        if compiler.sass_files.empty?
+          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
+
+      def new_compiler_instance(additional_options = {})
+        Compass::Compiler.new(working_path,
           projectize(Compass.configuration.sass_dir),
           projectize(Compass.configuration.css_dir),
           Compass.sass_engine_options.merge(:quiet => options[:quiet],
-                                            :force => options[:force]))
-        compiler.run
+                                            :force => options[:force]).merge(additional_options))
       end
 
     end