chriseppstein-compass 0.5.9 → 0.6.0

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

@@ -30,16 +30,22 @@
   // A container should group all your columns
   .container
     +container
+  .column, #{enumerate("div.span", 1, !blueprint_grid_columns)}
+    +column-base
+  // The last column in a row needs this class (or mixin) or it will end up on the next row.
+  .last, div.last
+    +last
   // Use these classes (or mixins) to set the width of a column.
-  @for !n from 1 to !blueprint_grid_columns + 1
+  @for !n from 1 to !blueprint_grid_columns
     .span-#{!n}
       +span(!n)
-    div
+  .span-#{!blueprint_grid_columns}, div.span-#{!blueprint_grid_columns}
+    +span(!blueprint_grid_columns)
+    :margin 0
+  input, textarea, select
+    @for !n from 1 through !blueprint_grid_columns
       &.span-#{!n}
-        +column(!n, !n == !blueprint_grid_columns)
-  // The last column in a row needs this class (or mixin) or it will end up on the next row.
-  div.last
-    +last
+        +span(!n, true)
   // Add these to a column to append empty cols.
   @for !n from 1 to !blueprint_grid_columns
     .append-#{!n}
@@ -50,10 +56,10 @@
       +prepend(!n)
   // Use these classes on an element to push it into the
   // next column, or to pull it into the previous column.
-  @for !n from 1 to !blueprint_grid_columns + 1
+  @for !n from 1 through !blueprint_grid_columns
     .pull-#{!n}
       +pull(!n)
-  @for !n from 1 to !blueprint_grid_columns + 1
+  @for !n from 1 through !blueprint_grid_columns
     .push-#{!n}
       +push(!n)
 
@@ -69,16 +75,17 @@
 // The last column in a row needs this mixin or it will end up on the next row.
 // TODO add this to span mixin when we have optional arguments
 =last
-  :margin
-    :right 0
+  :margin-right 0
 
-=span(!n)
-  :width = !blueprint_grid_width * !n + (!blueprint_grid_margin * (!n - 1))
+=span(!n, !override = false)
+  !width = !blueprint_grid_width * !n + (!blueprint_grid_margin * (!n - 1))
+  @if !override
+    :width = !width !important
+  @else
+    :width = !width
 
-// Use this mixins to set the width of n columns.
-=column(!n, !last = false)
+=column-base(!last = false)
   +float-left
-  +span(!n)
   @if !last
     +last
   @else
@@ -86,6 +93,12 @@
   * html &
     :overflow-x hidden
 
+// Use this mixins to set the width of n columns.
+=column(!n, !last = false)
+  +column-base(!last)
+  +span(!n)
+
+
 // Mixin to a column to append n empty cols.
 =append(!n)
   :padding-right = (!blueprint_grid_outer_width) * !n

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

@@ -0,0 +1,44 @@
+=no-link-icon
+  :background transparent none !important
+  :padding 0 !important
+  :margin 0 !important
+
+=link-icon-base
+  :padding 2px 22px 2px 0
+  :margin -2px 0
+  :background-repeat no-repeat
+  :background-position right center
+
+=link-icon(!name, !include_base = true)
+  @if !include_base
+    +link-icon-base
+  :background-image= image_url("link_icons/#{!name}")
+
+=link-icons
+  a[href^="http:"],
+  a[href^="mailto:"],
+  a[href^="http:"]:visited,
+  a[href$=".pdf"],
+  a[href$=".doc"],
+  a[href$=".xls"],
+  a[href$=".rss"], 
+  a[href$=".rdf"],
+  a[href^="aim:"]
+    +link-icon-base
+  a[href^="http:"]
+    +link-icon("external.png", false)
+  a[href^="mailto:"]
+    +link-icon("email.png", false)
+  a[href^="http:"]:visited
+    +link-icon("visited.png", false)
+  a[href$=".pdf"]
+    +link-icon("pdf.png", false)
+  a[href$=".doc"]
+    +link-icon("doc.png", false)
+  a[href$=".xls"]
+    +link-icon("xls.png", false)
+  a[href$=".rss"],
+  a[href$=".rdf"]
+    +link-icon("feed.png", false)
+  a[href^="aim:"]
+    +link-icon("im.png", false)

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

@@ -0,0 +1,104 @@
+@import grid.sass
+@import compass/utilities/general/float.sass
+
+// Main layout grid, override these constants to build your grid and container sizes.
+!blueprint_grid_columns ||= 24
+!blueprint_grid_width   ||= 30px
+!blueprint_grid_margin  ||= 10px
+
+!blueprint_grid_outer_width = !blueprint_grid_width + !blueprint_grid_margin
+!blueprint_container_size = !blueprint_grid_outer_width * !blueprint_grid_columns - !blueprint_grid_margin
+
+// Columns
+// Note: If you use this mixin without the class and want to support ie6
+//       you must set text-align left on your container element in an IE stylesheet.
+=container
+  :width = !blueprint_container_size
+  :margin 0 auto
+  :direction rtl
+  +clearfix
+
+// The last column in a row needs this mixin or it will end up on the next row.
+// TODO add this to span mixin when we have optional arguments
+=last
+  :margin-left 0
+
+=column-base(!last = false)
+  +float-right
+  @if !last
+    +last
+  @else
+    :margin-left = !blueprint_grid_margin
+  * html &
+    :overflow-x hidden
+
+// Mixin to a column to append n empty cols.
+=append(!n)
+  :padding-left = (!blueprint_grid_outer_width) * !n
+
+// Mixin to a column to prepend n empty cols.
+=prepend(!n)
+  :padding-right = (!blueprint_grid_outer_width) * !n
+
+// mixin to a column to move it n columns to the left
+=pull(!n, !last = false)
+  :position relative
+  @if !last
+    :margin-right = (-!blueprint_grid_outer_width * !n) + !blueprint_grid_margin
+  @else
+    :margin-right = -!blueprint_grid_outer_width * !n
+
+// mixin to a column to push it n columns to the right
+=push(!n)
+  +float-right
+  :position relative
+  :margin
+    :top 0
+    :left = -!blueprint_grid_outer_width * !n
+    :bottom 1.5em
+    :right = !blueprint_grid_outer_width * !n
+
+// Border on left hand side of a column.
+=border
+  :padding-left = !blueprint_grid_margin / 2 - 1
+  :margin-left = !blueprint_grid_margin / 2
+  :border-left 1px solid #eee
+
+// 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
+  :border-left 1px solid #eee
+
+=rtl-typography(!body_selector = "body")
+  html #{!body_selector}
+    :font-family Arial, sans-serif
+    @if !body_selector != "body"
+      +rtl-typography-defaults
+  @if !body_selector == "body"
+    body
+      +rtl-typography-defaults
+
+=rtl-typography-defaults
+  h1, h2, h3, h4, h5, h6
+    :font-family Arial, sans-serif
+
+  pre, code, tt
+    :font-family monospace
+
+  p
+    img.right
+      +float-left
+      :margin 1.5em 1.5em 1.5em 0
+      :padding 0
+    img.left
+      +float-right
+      :margin 1.5em 0 1.5em 1.5em
+      :padding 0
+
+  dd, ul, ol
+    :margin-left 0
+    :margin-right 1.5em
+
+  td, th
+    :text-align right

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

@@ -2,7 +2,7 @@
 @import compass/utilities/links/link_colors.sass
 @import compass/utilities/general/float.sass
 
-!blueprint_font_family       ||= "Helvetica Neue, Helvetica, Arial, sans-serif"
+!blueprint_font_family       ||= "Helvetica Neue, Arial, Helvetica, sans-serif"
 !blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace"
 
 // The +blueprint-typography mixin must be mixed into the top level of your stylesheet.
@@ -70,7 +70,6 @@
     :font-size 1.2em
     :line-height 1.25
     :margin-bottom 1.25em
-    :height 1.25em
   h5
     +header-text
     :font-size 1em
@@ -84,13 +83,14 @@
     :margin 0
   p
     :margin 0 0 1.5em
-    img
+    img.left
       +float-left
       :margin 1.5em 1.5em 1.5em 0
       :padding 0
-      &.right
-        +float-right
-        :margin 1.5em 0 1.5em 1.5em
+    img.right
+      +float-right
+      :margin 1.5em 0 1.5em 1.5em
+      :padding 0
   a
     :text-decoration underline
     +link-colors(!link_color, !link_hover_color, !link_active_color, !link_visited_color, !link_focus_color)
@@ -114,11 +114,10 @@
     :font-style italic
   del
     :color #666
-  pre, code
+  pre
     :margin 1.5em 0
     :white-space pre
-    +fixed-width-text
-  tt
+  pre, code, tt
     +fixed-width-text
   li ul,  li ol
     :margin 0 1.5em
@@ -139,12 +138,12 @@
     :width 100%
   th
     :font-weight bold
-    :background #C3D9FF
-    :padding 4px 10px 4px 5px
-  td
+  thead th
+    :background= !blueprint_table_header_color
+  th, td, caption
     :padding 4px 10px 4px 5px
   tr.even td
-    :background #E5ECF9
+    :background= !blueprint_table_stripe_color
   tfoot
     :font-style italic
   caption

data/frameworks/blueprint/templates/link_icons/link_icons.sass

@@ -0,0 +1,13 @@
+@import blueprint/modules/link_icons.sass
+
+// This turns link icons on for all links. You can change the scoping selector from
+// body to something more specific if you prefer.
+body
+  +link-icons
+  // Use this class if a link gets an icon when it shouldn't.
+  a.noicon
+    +no-link-icon
+  // Not all links have a url structure that can be detected,
+  // So you can set them explicitly yourself like so:
+  a#this-is-a-pdf-link
+    +link-icon("pdf.png")

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

@@ -0,0 +1,10 @@
+stylesheet "link_icons.sass", :media => 'screen, projection'
+
+image 'link_icons/doc.png'
+image 'link_icons/email.png'
+image 'link_icons/external.png'
+image 'link_icons/feed.png'
+image 'link_icons/im.png'
+image 'link_icons/pdf.png'
+image 'link_icons/visited.png'
+image 'link_icons/xls.png'

data/lib/compass/commands/generate_grid_background.rb

@@ -12,9 +12,6 @@ module Compass
       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."

data/lib/compass/commands/project_base.rb

@@ -13,6 +13,9 @@ module Compass
         super(working_path, options)
         self.project_name = determine_project_name(working_path, options)
         Compass.configuration.project_path = determine_project_directory(working_path, options)
+        read_project_configuration
+        Compass.configuration.set_maybe(options)
+        Compass.configuration.set_defaults!
       end
 
       protected

data/lib/compass/commands/update_project.rb

@@ -11,9 +11,6 @@ module Compass
       end
 
       def perform
-        read_project_configuration
-        Compass.configuration.set_maybe(options)
-        Compass.configuration.set_defaults!
         Compass::Compiler.new(working_path,
                               projectize(Compass.configuration.sass_dir),
                               projectize(Compass.configuration.css_dir),

data/lib/compass/commands/write_configuration.rb

@@ -10,9 +10,6 @@ module Compass
       end
 
       def perform
-        read_project_configuration
-        Compass.configuration.set_maybe(options)
-        Compass.configuration.set_defaults!
         config_file = projectize("config.rb")
         if File.exists?(config_file)
           if options[:force]

data/lib/compass/configuration.rb

@@ -5,13 +5,15 @@ module Compass
     include Singleton
 
     ATTRIBUTES = [
+      :project_type,
       :project_path,
       :css_dir,
       :sass_dir,
       :images_dir,
       :javascripts_dir,
       :output_style,
-      :environment
+      :environment,
+      :http_images_path
     ]
 
     attr_accessor *ATTRIBUTES
@@ -52,12 +54,18 @@ module Compass
 
     def default_all(options)
       ATTRIBUTES.each do |a|
-        self.send("#{a}=", options[a]) unless self.send(a)
+        set_default_unless_set(a, options[a])
       end
     end
 
+    def set_default_unless_set(attribute, value)
+      self.send("#{attribute}=", value) unless self.send(attribute)
+    end
+
     def set_defaults!
-      default_all(ATTRIBUTES.inject({}){|m, a| m[a] = default_for(a); m})
+      ATTRIBUTES.each do |a|
+        set_default_unless_set(a, default_for(a))
+      end
     end
 
     def default_for(attribute)
@@ -77,6 +85,14 @@ module Compass
       "images"
     end
 
+    def default_http_images_path
+      "/#{images_dir}"
+    end
+
+    def comment_for_http_images_path
+      "# To enable relative image paths using the images_url() function:\n# http_images_path = :relative\n"
+    end
+
     def default_output_style
       if environment == :development
         :expanded
@@ -98,8 +114,13 @@ module Compass
       contents << "\n" if required_libraries.any?
       ATTRIBUTES.each do |prop|
         value = send(prop)
-        unless value.nil?
-          contents << %Q(#{prop} = #{value.inspect}\n)
+        if respond_to?("comment_for_#{prop}")
+          contents << send("comment_for_#{prop}")
+        end
+        if block_given? && (to_emit = yield(prop, value))
+          contents << to_emit
+        else
+          contents << %Q(#{prop} = #{value.inspect}\n) unless value.nil?
         end
       end
       contents

data/lib/compass/installers/rails.rb

@@ -4,7 +4,7 @@ module Compass
     class RailsInstaller < Base
 
       def configure
-        configuration_file = targetize('config/initializers/compass.rb')
+        configuration_file = targetize('config/compass.config')
         if File.exists?(configuration_file)
           open(configuration_file) do |config|
             eval(config.read, nil, configuration_file)
@@ -20,6 +20,11 @@ module Compass
       end
 
       def prepare
+        write_file(targetize('config/compass.config'), Compass.configuration.serialize do |prop, value|
+          if prop == :project_path
+            "project_path = RAILS_ROOT if defined?(RAILS_ROOT)\n"
+          end
+        end)
         write_file targetize('config/initializers/compass.rb'), initializer_contents
       end
 
@@ -81,11 +86,7 @@ Emit compiled stylesheets to #{recommended_location}/? (Y/n) }
       def initializer_contents
         %Q{require 'compass'
 # If you have any compass plugins, require them here.
-Compass.configuration do |config|
-  config.project_path = RAILS_ROOT
-  config.sass_dir = "#{sass_dir}"
-  config.css_dir = "#{css_dir}"
-end
+Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.config"))
 Compass.configure_sass_plugin!
 }
       end

data/lib/sass_extensions.rb

@@ -2,6 +2,7 @@ require 'sass'
 
 module Sass::Script::Functions
   COMMA_SEPARATOR = /\s*,\s*/
+
   def nest(*arguments)
     nested = arguments.map{|a| a.value}.inject do |memo,arg|
       ancestors = memo.split(COMMA_SEPARATOR)
@@ -10,4 +11,27 @@ module Sass::Script::Functions
     end
     Sass::Script::String.new(nested)
   end
+
+  def enumerate(prefix, from, through)
+    selectors = (from.value..through.value).map{|i| "#{prefix.value}-#{i}"}.join(", ")
+    Sass::Script::String.new(selectors)
+  end
+
+  def image_url(path)
+    http_images_path = if Compass.configuration.http_images_path == :relative
+      if (target_css_file = options[:css_filename])
+        images_path = File.join(Compass.configuration.project_path, Compass.configuration.images_dir)
+        Pathname.new(images_path).relative_path_from(Pathname.new(File.dirname(target_css_file))).to_s
+      else
+        nil
+      end
+    else
+      Compass.configuration.http_images_path
+    end
+    if http_images_path
+      http_images_path = "#{http_images_path}/" unless http_images_path[-1..-1] == "/"
+      path = "#{http_images_path}#{path}"
+    end
+    Sass::Script::String.new("url(#{path})")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/compass
+- CHANGELOG.markdown
 - lib/compass/actions.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/create_project.rb
@@ -82,6 +83,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - bin/compass
+- CHANGELOG.markdown
 - compass.gemspec
 - examples/blueprint_default/index.html
 - examples/blueprint_default/parts/elements.html
@@ -94,19 +96,32 @@ files:
 - examples/blueprint_default/src/images/grid.png
 - examples/blueprint_default/src/print.sass
 - examples/blueprint_default/src/screen.sass
+- examples/blueprint_plugins/config.rb
 - examples/blueprint_plugins/images/buttons/cross.png
 - examples/blueprint_plugins/images/buttons/key.png
 - examples/blueprint_plugins/images/buttons/tick.png
+- examples/blueprint_plugins/images/link_icons/doc.png
+- examples/blueprint_plugins/images/link_icons/email.png
+- examples/blueprint_plugins/images/link_icons/external.png
+- examples/blueprint_plugins/images/link_icons/feed.png
+- examples/blueprint_plugins/images/link_icons/im.png
+- examples/blueprint_plugins/images/link_icons/pdf.png
+- examples/blueprint_plugins/images/link_icons/visited.png
+- examples/blueprint_plugins/images/link_icons/xls.png
+- examples/blueprint_plugins/images/test-small.jpg
+- examples/blueprint_plugins/images/test.jpg
+- examples/blueprint_plugins/images/valid.png
 - examples/blueprint_plugins/index.html
-- examples/blueprint_plugins/parts/buttons.html
-- examples/blueprint_plugins/parts/fancy_type.html
-- examples/blueprint_plugins/parts/test-small.jpg
-- examples/blueprint_plugins/parts/test.jpg
-- examples/blueprint_plugins/parts/valid.png
+- examples/blueprint_plugins/plugins/buttons.html
+- examples/blueprint_plugins/plugins/fancy_type.html
+- examples/blueprint_plugins/plugins/link_icons.html
+- examples/blueprint_plugins/plugins/rtl.html
 - examples/blueprint_plugins/src/buttons.sass
 - examples/blueprint_plugins/src/ie.sass
 - examples/blueprint_plugins/src/images/grid.png
+- examples/blueprint_plugins/src/link_icons.sass
 - examples/blueprint_plugins/src/print.sass
+- examples/blueprint_plugins/src/rtl_screen.sass
 - examples/blueprint_plugins/src/screen.sass
 - examples/blueprint_scoped/src/ie.sass
 - examples/blueprint_scoped/src/print.sass
@@ -154,7 +169,9 @@ files:
 - frameworks/blueprint/stylesheets/blueprint/modules/_form.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass
+- frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass
+- frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass
 - frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass
@@ -163,6 +180,16 @@ files:
 - frameworks/blueprint/templates/buttons/buttons/tick.png
 - frameworks/blueprint/templates/buttons/buttons.sass
 - frameworks/blueprint/templates/buttons/manifest.rb
+- frameworks/blueprint/templates/link_icons/link_icons/doc.png
+- frameworks/blueprint/templates/link_icons/link_icons/email.png
+- frameworks/blueprint/templates/link_icons/link_icons/external.png
+- frameworks/blueprint/templates/link_icons/link_icons/feed.png
+- frameworks/blueprint/templates/link_icons/link_icons/im.png
+- frameworks/blueprint/templates/link_icons/link_icons/pdf.png
+- frameworks/blueprint/templates/link_icons/link_icons/visited.png
+- frameworks/blueprint/templates/link_icons/link_icons/xls.png
+- frameworks/blueprint/templates/link_icons/link_icons.sass
+- frameworks/blueprint/templates/link_icons/manifest.rb
 - frameworks/blueprint/templates/project/grid.png
 - frameworks/blueprint/templates/project/ie.sass
 - frameworks/blueprint/templates/project/manifest.rb