compass-edge 0.9.4 → 0.9.5.0

data/examples/yui/extensions/yui/templates/project/manifest.rb

@@ -0,0 +1 @@
+stylesheet 'screen.sass', :media => "screen, projection"

data/examples/yui/extensions/yui/templates/project/screen.sass

@@ -0,0 +1,4 @@
+@import yui.sass
+@import compass/reset.sass
+
++yui

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

@@ -3,7 +3,7 @@ module Compass
     module Rails
       module ConfigurationDefaults
 
-        def default_project_type
+        def project_type_without_default
           :rails
         end
 
@@ -11,6 +11,10 @@ module Compass
           File.join("public", "images")
         end
 
+        def default_fonts_dir
+          File.join("public", "fonts")
+        end
+
         def default_javascripts_dir
           File.join("public", "javascripts")
         end
@@ -23,6 +27,10 @@ module Compass
           "/javascripts"
         end
 
+        def default_http_fonts_path
+          "/fonts"
+        end
+
         def default_http_stylesheets_path
           "/stylesheets"
         end

data/lib/compass/commands/watch_project.rb

@@ -61,7 +61,7 @@ module Compass
             puts ">>> Change detected to: #{file}"
             compiler.run
           rescue StandardError => e
-            ::Compass::Exec.report_error(e, options)
+            ::Compass::Exec::Helpers.report_error(e, options)
           end
         end
       end

data/lib/compass/compiler.rb

@@ -48,7 +48,15 @@ module Compass
         directory dir
       end
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        compile sass_filename, css_filename, options
+        begin
+          compile sass_filename, css_filename, options
+        rescue Sass::SyntaxError => e
+          full_exception = Compass.configuration.environment == :development
+          logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
+          write_file(css_filename,
+            Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception),
+            options.merge(:force => true))
+        end
       end
     end
   end

data/lib/compass/configuration.rb

@@ -1,34 +1,39 @@
 module Compass
   module Configuration
 
+    def self.attributes_for_directory(dir_name, http_dir_name = dir_name)
+      [
+        "#{dir_name}_dir",
+        "#{dir_name}_path",
+        ("http_#{http_dir_name}_dir" if http_dir_name),
+        ("http_#{http_dir_name}_path" if http_dir_name)
+      ].compact.map{|a| a.to_sym}
+    end
+
     ATTRIBUTES = [
+      # What kind of project?
       :project_type,
+      # Where is the project?
       :project_path,
-      :css_dir,
-      :sass_dir,
-      :images_dir,
-      :javascripts_dir,
-      :extensions_dir,
-      :css_path,
-      :sass_path,
-      :images_path,
-      :javascripts_path,
-      :extensions_path,
       :http_path,
-      :http_images_dir,
-      :http_stylesheets_dir,
-      :http_javascripts_dir,
-      :http_images_path,
-      :http_stylesheets_path,
-      :http_javascripts_path,
+      # Where are the various bits of the project
+      attributes_for_directory(:css, :stylesheets),
+      attributes_for_directory(:sass, nil),
+      attributes_for_directory(:images),
+      attributes_for_directory(:javascripts),
+      attributes_for_directory(:fonts),
+      attributes_for_directory(:extensions, nil),
+      # Compilation options
       :output_style,
       :environment,
       :relative_assets,
       :additional_import_paths,
       :sass_options,
       :asset_host,
-      :asset_cache_buster
-    ]
+      :asset_cache_buster,
+      :line_comments,
+      :color_output
+    ].flatten
 
   end
 end

data/lib/compass/configuration/adapters.rb

@@ -49,7 +49,7 @@ module Compass
         load_paths = []
         load_paths << sass_path if sass_path
         Compass::Frameworks::ALL.each do |framework|
-          load_paths << framework.stylesheets_directory
+          load_paths << framework.stylesheets_directory if File.exists?(framework.stylesheets_directory)
         end
         load_paths += resolve_additional_import_paths
         load_paths

data/lib/compass/configuration/defaults.rb

@@ -14,6 +14,14 @@ module Compass
         "extensions"
       end
 
+      def default_fonts_dir
+        File.join(top_level.css_dir, "fonts")
+      end
+
+      def default_environment
+        :development
+      end
+
       def default_output_style
         if top_level.environment == :development
           :expanded
@@ -26,6 +34,10 @@ module Compass
         top_level.environment == :development
       end
 
+      def default_color_output
+        true
+      end
+
       def default_sass_path
         if (pp = top_level.project_path) && (dir = top_level.sass_dir)
           File.join(pp, dir)
@@ -56,6 +68,12 @@ module Compass
         end
       end
 
+      def default_fonts_path
+        if (pp = top_level.project_path) && (dir = top_level.fonts_dir)
+          File.join(pp, dir)
+        end
+      end
+
 
       def default_http_images_dir
         top_level.images_dir
@@ -73,6 +91,18 @@ module Compass
         http_root_relative top_level.http_stylesheets_dir
       end
 
+      def default_http_fonts_dir
+        if fd = top_level.fonts_dir_without_default
+          fd
+        else
+          "#{top_level.http_stylesheets_dir}/fonts"
+        end
+      end
+
+      def default_http_fonts_path
+        http_root_relative top_level.http_fonts_dir
+      end
+
       def default_http_javascripts_dir
         top_level.javascripts_dir
       end

data/lib/compass/frameworks.rb

@@ -28,7 +28,7 @@ module Compass
     end
 
     def register(name, *arguments)
-      if idx = ALL.index{|f| f.name.to_s == name.to_s}
+      if idx = ALL.index(self[name])
         ALL[idx] = Framework.new(name, *arguments)
       else
         ALL << Framework.new(name, *arguments)

data/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass

@@ -1,3 +1,31 @@
-@import blueprint/screen.sass
+@import blueprint/colors.sass
+@import blueprint/grid.sass
+@import blueprint/typography.sass
+@import blueprint/utilities.sass
+@import blueprint/form.sass
+@import blueprint/interaction.sass
+@import blueprint/debug.sass
 @import blueprint/print.sass
 @import blueprint/ie.sass
+
+// Usage examples:
+// As a top-level mixin, apply to any page that includes the stylesheet:
+//   +blueprint
+// Scoped by a presentational class:
+//   body.blueprint
+//    +blueprint(true)
+// Scoped by semantic selectors:
+//   body#page-1, body#page-2, body.a-special-page-type
+//     +blueprint(true)
+// Deprecated:
+//   You can pass the body selector as the first argument when used as a top-level mixin
+//   +blueprint("body#page-1, body#page-2, body.a-special-page-type")
+=blueprint(!body_selector = "body")
+  @if not (!body_selector == "body" or !body_selector == true)
+    @debug "[DEPRECATED] To specify a the selector \"#{!body_selector}\" to +blueprint, pass true as the first argument and mix it into #{!body_selector}."
+  +blueprint-typography(!body_selector)
+  +blueprint-utilities
+  +blueprint-grid
+  +blueprint-debug
+  +blueprint-interaction
+  +blueprint-form

data/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass

@@ -0,0 +1,84 @@
+@import compass/css3/inline_block.sass
+@import compass/utilities/general/float.sass
+
+// Button Font
+!blueprint_button_font_family ||= "\"Lucida Grande\", Tahoma, Arial, Verdana, sans-serif"
+
+// Default Button Colors
+!blueprint_button_border_color ||= #DEDEDE
+!blueprint_button_background_color ||= #F5F5F5
+!blueprint_button_font_color ||= #565656
+
+// Default Button Hover Colors
+!blueprint_button_hover_border_color ||= #C2E1EF
+!blueprint_button_hover_background_color ||= #DFF4FF
+!blueprint_button_hover_font_color ||= #336699
+
+// Default Button Active Colors
+!blueprint_button_active_border_color ||= #6299C5
+!blueprint_button_active_background_color ||= #6299C5
+!blueprint_button_active_font_color ||= #FFF
+
+//**
+  Sets the colors for a button
+  @param border_highlight_color
+    The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
+=button-colors(!font_color = !blueprint_button_font_color, !bg_color = !blueprint_button_background_color, !border_color = !blueprint_button_border_color, !border_highlight_color = !border_color + #101010)
+  background-color= !bg_color
+  border-color= !border_highlight_color !border_color !border_color !border_highlight_color
+  color= !font_color
+
+//**
+  Sets the colors for a button in the active state
+  @param border_highlight_color
+    The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
+=button-active-colors(!font_color = !blueprint_button_active_font_color, !bg_color = !blueprint_button_active_background_color, !border_color = !blueprint_button_active_border_color, !border_highlight_color = !border_color + #101010)
+  &:active
+    +button-colors(!font_color, !bg_color, !border_color, !border_highlight_color)
+
+//**
+  Sets the colors for a button in the hover state.
+  @param border_highlight_color
+    The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
+=button-hover-colors(!font_color = !blueprint_button_hover_font_color, !bg_color = !blueprint_button_hover_background_color, !border_color = !blueprint_button_hover_border_color, !border_highlight_color = !border_color + #101010)
+  &:hover
+    +button-colors(!font_color, !bg_color, !border_color, !border_highlight_color)
+
+=button-base(!float = false)
+  @if !float
+    display: block
+    +float(!float)
+  @else
+    +inline-block
+  margin: 0.7em 0.5em 0.7em 0
+  border-width: 1px
+  border-style: solid
+  font-family= !blueprint_button_font_family
+  font-size: 100%
+  line-height: 130%
+  text-decoration: none
+  font-weight: bold
+  cursor: pointer
+  img
+    margin: 0 3px -3px 0 !important
+    padding: 0
+    border: none
+    width: 16px
+    height: 16px
+    float: none
+    
+
+=anchor-button(!float = false)
+  +button-base(!float)
+  padding: 5px 10px 5px 7px
+
+=button-button(!float = false)
+  +button-base(!float)
+  width: auto
+  overflow: visible
+  padding: 4px 10px 3px 7px
+  &[type]
+    padding: 4px 10px 4px 7px
+    line-height: 17px
+  *:first-child+html &[type]
+    padding: 4px 10px 3px 7px

data/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass

@@ -0,0 +1,33 @@
+!font_color            ||= #333
+!quiet_color           ||= !font_color + #333
+!loud_color            ||= !font_color - #222
+
+!header_color          ||= !font_color - #111
+
+!link_color            ||= #009
+!link_hover_color      ||= #000
+!link_focus_color      ||= !link_hover_color
+!link_active_color     ||= !link_color + #C00
+!link_visited_color    ||= !link_color - #333
+
+!feedback_border_color ||= #DDD
+!success_color         ||= #264409
+!success_bg_color      ||= #E6EFC2
+!success_border_color  ||= #C6D880
+
+!notice_color          ||= #514721
+!notice_bg_color       ||= #FFF6BF
+!notice_border_color   ||= #FFD324
+
+!error_color           ||= #8A1F11
+!error_bg_color        ||= #FBE3E4
+!error_border_color    ||= #FBC2C4
+
+!highlight_color       ||= #FF0
+!added_color           ||= #FFF
+!added_bg_color        ||= #060
+!removed_color         ||= #FFF
+!removed_bg_color      ||= #900
+
+!blueprint_table_header_color ||= #C3D9FF
+!blueprint_table_stripe_color ||= #E5ECF9

data/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass

@@ -0,0 +1,9 @@
+=showgrid(!image = "grid.png")
+  background= image_url(!image)
+
+=blueprint-debug(!grid_image = "grid.png")
+  // Use this class on any column or container to see the grid.
+  // TODO: prefix this with the project path.
+  .showgrid
+    +showgrid(!grid_image)
+  

data/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass

@@ -0,0 +1,82 @@
+@import typography.sass
+
+//
+  To install the fancy type plugin:
+    1. import the fancy_type module: @import blueprint/fancy_type
+    2. mixin +fancy-type to your project's body or at the top level of your stylesheet:
+      body
+        +fancy-type
+
+=fancy-type
+  +fancy-paragraphs
+  .caps
+    +caps
+  .dquo
+    +dquo
+  .alt
+    +alt
+
+// Indentation instead of line shifts for sibling paragraphs. Mixin to a style like p + p
+=sibling-indentation
+  text-indent: 2em
+  margin-top: -1.5em
+  /* Don't want this in forms.
+  form &
+    text-indent: 0
+
+//
+  For great looking type, use this code instead of asdf: 
+  <span class="alt">asdf</span>  
+  Best used on prepositions and ampersands.
+
+=alt
+  color: #666
+  font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif
+  font-style: italic
+  font-weight: normal
+
+//
+  For great looking quote marks in titles, replace "asdf" with:
+  <span class="dquo">&#8220;</span>asdf&#8221;
+  (That is, when the title starts with a quote mark). 
+  (You may have to change this value depending on your font size).
+=dquo(!offset = 0.5em)
+  margin-left: -!offset
+
+//
+  Reduced size type with incremental leading
+  (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+  
+  This could be used for side notes. For smaller type, you don't necessarily want to 
+  follow the 1.5x vertical rhythm -- the line-height is too much. 
+  
+  Using this mixin, reduces your font size and line-height so that for 
+  every four lines of normal sized type, there is five lines of the sidenote. eg:
+  
+  Arguments:
+    font_size - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px.
+    base_font_size - The base font size in pixels. Defaults to 12px
+    old_line_height - The old line height. Defaults to 1.5 times the base_font_size
+=incr(!font_size = 10px, !base_font_size = !blueprint_font_size, !old_line_height = !base_font_size * 1.5)
+  font-size= 1em * !font_size / !base_font_size
+  line-height= 1em * !old_line_height / !font_size * 4 / 5
+  margin-bottom: 1.5em
+
+//
+  Surround uppercase words and abbreviations with this class.
+  Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/]
+=caps
+  font-variant: small-caps
+  letter-spacing: 1px
+  text-transform: lowercase
+  font-size: 1.2em
+  line-height: 1%
+  font-weight: bold
+  padding: 0 2px
+
+=fancy-paragraphs
+  p + p
+    +sibling-indentation
+  p.incr,
+  .incr p
+    +incr