compass-edge 0.9.5.0 → 0.10.0.pre

data/lib/compass/configuration/inheritance.rb

@@ -156,7 +156,7 @@ module Compass
                 :raw => (instance.send("raw_#{prop}") rescue nil),
                 :value => (instance.send("#{prop}_without_default") rescue nil),
                 :default => (instance.send("default_#{prop}") rescue nil),
-                :resolved => instance.send(prop)
+                :resoved => instance.send(prop)
               }
             end
             normalized_attrs[prop] = values

data/lib/compass/configuration/serialization.rb

@@ -9,13 +9,13 @@ module Compass
 
       module ClassMethods
         def new_from_file(config_file)
-          data = Data.new(config_file)
+          data = Data.new
           data.parse(config_file)
           data
         end
 
         def new_from_string(contents, filename)
-          data = Data.new(filename)
+          data = Data.new
           data.parse_string(contents, filename)
           data
         end

data/lib/compass/errors.rb

@@ -4,7 +4,4 @@ module Compass
 
   class FilesystemConflict < Error
   end
-
-  class MissingDependency < Error
-  end
-end
+end

data/lib/compass/exec.rb

@@ -3,7 +3,6 @@ require 'optparse'
 require 'compass/logger'
 require 'compass/errors'
 require 'compass/actions'
-require 'compass/installers'
 require 'compass/commands'
 
 module Compass::Exec

data/lib/compass/exec/project_options_parser.rb

@@ -8,10 +8,6 @@ module Compass::Exec::ProjectOptionsParser
       self.options[:configuration_file] = configuration_file
     end
 
-    opts.on('--app APP', 'Tell compass what kind of application it is integrating with. E.g. rails') do |project_type|
-      self.options[:project_type] = project_type.to_sym
-    end
-
     opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
       self.options[:sass_dir] = sass_dir
     end

data/lib/compass/frameworks.rb

@@ -15,24 +15,10 @@ module Compass
         @templates_directory = options[:templates_directory] || File.join(path, 'templates')
         @stylesheets_directory = options[:stylesheets_directory] || File.join(path, 'stylesheets')
       end
-      def template_directories
-        Dir.glob(File.join(templates_directory, "*")).map{|f| File.basename(f)}
-      end
-      def manifest_file(pattern)
-        File.join(templates_directory, pattern.to_s, "manifest.rb")
-      end
-      def manifest(pattern, options = {})
-        options[:pattern_name] ||= pattern
-        Compass::Installers::Manifest.new(manifest_file(pattern), options)
-      end
     end
 
     def register(name, *arguments)
-      if idx = ALL.index(self[name])
-        ALL[idx] = Framework.new(name, *arguments)
-      else
-        ALL << Framework.new(name, *arguments)
-      end
+      ALL << Framework.new(name, *arguments)
     end
 
     def [](name)
@@ -61,31 +47,6 @@ module Compass
       end
     end
 
-    def template_exists?(template)
-      framework_name, template = template.split(%r{/}, 2)
-      template ||= "project"
-      if framework = self[framework_name]
-        return File.directory?(File.join(framework.templates_directory, template))
-      end
-      false
-    end
-
-    def template_usage(template)
-      framework_name, template = template.split(%r{/}, 2)
-      framework = self[framework_name]
-      template ||= "project"
-      usage_file = File.join(framework.templates_directory, template, "USAGE.markdown")
-      if File.exists?(usage_file)
-        File.read(usage_file)
-      elsif help = framework.manifest(template).help
-        help
-      else
-        <<-END.gsub(/^ {8}/, '')
-          No Usage!
-        END
-      end
-    end
-
   end
 end
 

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

@@ -1,31 +1,3 @@
-@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/screen.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/_ie.sass

@@ -56,6 +56,8 @@
 =blueprint-ie-defaults
   .container
     text-align: left
+  ol
+    margin-left: 2em
   sup
     vertical-align: text-top
   sub
@@ -66,8 +68,6 @@
     -ms-interpolation-mode: bicubic
   fieldset
     padding-top: 0
-  textarea
-    overflow: auto
   input
     &.text
       margin: 0.5em 0

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

@@ -1,4 +1,4 @@
-@import typography.sass
+@import modules/typography.sass
 @import compass/utilities/general/float.sass
 
 
@@ -62,6 +62,9 @@
     font:
       size: .9em
       family= !blueprint_fixed_font_family
+  img
+    +float-left
+    margin: 1.5em 1.5em 1.5em 0
   a
     img
       border: none

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

@@ -1,58 +1,3 @@
-// Global reset rules.
-// For more specific resets, use the reset mixins provided below
-=blueprint-global-reset
-  html, body
-    +blueprint-reset
-  html
-    font-size: 100.01%
-  +blueprint-nested-reset
+@import modules/reset.sass
 
-// 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
++blueprint-global-reset

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

@@ -1,2 +1,29 @@
-@debug "DEPRECATION WARNING: The blueprint/screen.sass will be removed. Please import blueprint.sass instead."
-@import blueprint.sass
+@import modules/colors.sass
+@import modules/grid.sass
+@import modules/typography.sass
+@import modules/utilities.sass
+@import modules/form.sass
+@import modules/interaction.sass
+@import modules/debug.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/modules/_buttons.sass

@@ -1,2 +1,84 @@
-@debug "DEPRECATION WARINING: blueprint/modules/buttons.sass has moved to blueprint/buttons.sass"
-@import blueprint/buttons.sass
+@import compass/utilities/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/modules/_colors.sass

@@ -1,2 +1,33 @@
-@debug "DEPRECATION WARINING: blueprint/modules/colors.sass has moved to blueprint/colors.sass"
-@import blueprint/colors.sass
+!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/modules/_debug.sass

@@ -1,2 +1,9 @@
-@debug "DEPRECATION WARINING: blueprint/modules/debug.sass has moved to blueprint/debug.sass"
-@import blueprint/debug.sass
+=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/modules/_fancy_type.sass

@@ -1,2 +1,82 @@
-@debug "DEPRECATION WARINING: blueprint/modules/fancy_type.sass has moved to blueprint/fancy_type.sass"
-@import blueprint/fancy_type.sass
+@import typography.sass
+
+//
+  To install the fancy type plugin:
+    1. import the fancy_type module: @import blueprint/modules/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