compass 0.10.6 → 0.11.alpha.0

data/Rakefile

@@ -1,16 +1,16 @@
 require 'rubygems'
-require 'rake'
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
+require 'bundler'
+Bundler.setup
 require 'compass'
 
 # ----- Default: Testing ------
 
-task :default => :run_tests
+task :default => :test
 
 require 'rake/testtask'
 require 'fileutils'
 
-Rake::TestTask.new :run_tests do |t|
+Rake::TestTask.new :test do |t|
   t.libs << 'lib'
   t.libs << 'test'
   test_files = FileList['test/**/*_test.rb']
@@ -33,8 +33,8 @@ task :examples do
   require 'haml'
   require 'sass'
   require 'pathname'
-  require 'lib/compass'
-  require 'lib/compass/exec'
+  require 'compass'
+  require 'compass/exec'
   FileList['examples/*'].each do |example|
     next unless File.directory?(example)
     puts "\nCompiling #{example}"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 10
-:patch: 6
-#:build: pre.1
+:minor: 11
+:state: alpha
+:build: 0

data/examples/blueprint_default/parts/forms.html.haml

@@ -55,6 +55,14 @@
           %a{ :href => "#" }
             Link
           \.
+        .info
+          This is a <div> with the class
+          %strong
+            \.info
+          \.
+          %a{ :href => "#" }
+            Link
+          \.
         .success
           This is a <div> with the class
           %strong

data/examples/css3/src/main.scss

@@ -32,6 +32,10 @@ h1 {
     margin: 0.5em 0 1em;
     text-align: center; } }
 
+.inset {
+  @include box-shadow(darken($border_color, 40), 5px, 5px, 2px, 3px, inset);
+}
+
 .gutter {
   display: block;
   float: left;

data/features/command_line.feature

@@ -79,7 +79,6 @@ Feature: Command Line
     When I initialize a project using: compass init rails --sass-dir app/stylesheets --css-dir public/stylesheets/compiled
     Then a config file config/compass.rb is reported created
     Then a config file config/compass.rb is created
-    And a sass file config/initializers/compass.rb is created
     And a sass file app/stylesheets/screen.scss is created
     And a sass file app/stylesheets/print.scss is created
     And a sass file app/stylesheets/ie.scss is created
@@ -248,6 +247,24 @@ Feature: Command Line
       | sass_dir | sass       |
       | css_dir  | assets/css |
 
+  @now
+  Scenario Outline: Print out a configuration value
+    Given I am using the existing project in test/fixtures/stylesheets/compass
+    When I run: compass config -p <property>
+    Then I should see the following output: <value>
+    And the command exits <exit>
+  
+    Examples:
+      | property        | value                    | exit     |
+      | extensions_dir  | extensions               | normally |
+      | extensions_path | $PROJECT_PATH/extensions | normally |
+      | css_dir         | tmp                      | normally |
+      | css_path        | $PROJECT_PATH/tmp        | normally |
+      | sass_dir        | sass                     | normally |
+      | sass_path       | $PROJECT_PATH/sass       | normally |
+      | foobar          | ERROR: configuration property 'foobar' does not exist | with a non-zero error code | 
+
+  @validator
   Scenario: Validate the generated CSS
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass validate
@@ -268,12 +285,12 @@ Feature: Command Line
       | sass/images.scss          |     3 |          3 |              0 |           0 |         3 |              3 |
       | sass/layout.sass          |     0 |          0 |              0 |           1 |         5 |             10 |
       | sass/legacy_clearfix.scss |     2 |          0 |              0 |           2 |         5 |             11 |
-      | sass/lists.scss           |     9 |          0 |              0 |           9 |        35 |            111 |
+      | sass/lists.scss           |    10 |          0 |              0 |          10 |        39 |            123 |
       | sass/print.sass           |     0 |          0 |              0 |           2 |        61 |             61 |
       | sass/reset.sass           |     4 |          1 |              0 |           2 |       190 |            664 |
       | sass/utilities.scss       |     2 |          0 |              0 |           2 |         3 |              9 |
       | ------------------------- | ----- | ---------- | -------------- | ----------- | --------- | -------------- |
-      | Total.*                   |    61 |         12 |              0 |          60 |       344 |            975 |
+      | Total.*                   |    62 |         12 |              0 |          61 |       348 |            987 |
 
   @listframeworks
   Scenario: List frameworks registered with compass

data/features/step_definitions/command_line_steps.rb

@@ -1,4 +1,3 @@
-require 'spec/expectations'
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../test')))
 
 require 'test_helper'
@@ -155,6 +154,9 @@ Then /^the command exits with a non\-zero error code$/ do
   @last_exit_code.should_not == 0
 end
 
+Then /^the command exits normally$/ do
+  @last_exit_code.should == 0
+end
 
 Then /^I am congratulated$/ do
   @last_result.should =~ /Congratulations!/
@@ -235,3 +237,7 @@ end
 Then /^I should see the following lines of output:$/ do |table|
   table.diff!([['blueprint'],['compass']])
 end
+
+Then /^I should see the following output: (.+)$/ do |expected|
+  (@last_result.strip + @last_error.strip).should == expected.gsub(/\$PROJECT_PATH/,Dir.pwd).strip
+end

data/frameworks/blueprint/stylesheets/_blueprint.scss

@@ -26,19 +26,9 @@
 // body#page-1, body#page-2, body.a-special-page-type
 //   +blueprint(true)
 // </pre>
-//
-// #### Deprecated:
-// You use to be able to pass the body selector as the first argument when used as a top-level mixin
-// <pre class="source-code sass">
-// +blueprint("body#page-1, body#page-2, body.a-special-page-type")
-// </pre>
 
-@mixin blueprint($body_selector: body) {
-  //@doc off
-  @if not ($body_selector == "body" or $body_selector == true) {
-    @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint, pass true as the first argument and mix it into #{$body_selector}."; }
-  //@doc on
-  @include blueprint-typography($body_selector);
+@mixin blueprint($nested: false) {
+  @include blueprint-typography($nested);
   @include blueprint-utilities;
   @include blueprint-grid;
   @include blueprint-debug;

data/frameworks/blueprint/stylesheets/blueprint/_buttons.scss

@@ -2,65 +2,65 @@
 @import "compass/utilities/general/float";
 
 // Button Font
-$blueprint_button_font_family: unquote('"Lucida Grande", Tahoma, Arial, Verdana, sans-serif') !default;
+$blueprint-button-font-family: "Lucida Grande", Tahoma, Arial, Verdana, sans-serif !default;
 
 // Default Button Colors
-$blueprint_button_border_color:     #dedede !default;
-$blueprint_button_background_color: #f5f5f5 !default;
-$blueprint_button_font_color:       #565656 !default;
+$blueprint-button-border-color:     #dedede !default;
+$blueprint-button-background-color: #f5f5f5 !default;
+$blueprint-button-font-color:       #565656 !default;
 
 // Default Button Hover Colors
-$blueprint_button_hover_border_color:     #c2e1ef !default;
-$blueprint_button_hover_background_color: #dff4ff !default;
-$blueprint_button_hover_font_color:       #336699 !default;
+$blueprint-button-hover-border-color:     #c2e1ef !default;
+$blueprint-button-hover-background-color: #dff4ff !default;
+$blueprint-button-hover-font-color:       #336699 !default;
 
 // Default Button Active Colors
-$blueprint_button_active_border_color:     #6299c5 !default;
-$blueprint_button_active_background_color: #6299c5 !default;
-$blueprint_button_active_font_color:       white !default;
+$blueprint-button-active-border-color:     #6299c5 !default;
+$blueprint-button-active-background-color: #6299c5 !default;
+$blueprint-button-active-font-color:       white !default;
 
 //**
 // 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.
+// @param border-highlight-color
+//   The highlight color defaults to whatever is the value of the border-color but it's one shade lighter.
 @mixin 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
+  $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;
+  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.
+// @param border-highlight-color
+//   The highlight color defaults to whatever is the value of the border-color but it's one shade lighter.
 @mixin 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
+  $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 {
-    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color);
+    @include 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.
+// @param border-highlight-color
+//   The highlight color defaults to whatever is the value of the border-color but it's one shade lighter.
 @mixin 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
+  $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 {
-    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color);
+    @include button-colors($font-color, $bg-color, $border-color, $border-highlight-color);
   }
 }
 
@@ -69,7 +69,7 @@ $blueprint_button_active_font_color:       white !default;
   @else      { @include 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%; font-weight: bold;
+  font-family: $blueprint-button-font-family; font-size: 100%; line-height: 130%; font-weight: bold;
   text-decoration: none;
   cursor: pointer;
   img {

data/frameworks/blueprint/stylesheets/blueprint/_colors.scss

@@ -1,32 +1,36 @@
-$font_color:     #333333 !default;
-$quiet_color:    $font_color + #333333 !default;
-$loud_color:     $font_color - #222222 !default;
-$header_color:   $font_color - #111111 !default;
-$alt_text_color: #666666 !default;
-$blueprint_background_color: #eeeeee !default;
+$font-color:     #333333 !default;
+$quiet-color:    lighten($font-color, 20%) !default;
+$loud-color:     darken($font-color, 13.33%) !default;
+$header-color:   darken($font-color, 6.67%) !default;
+$alt-text-color: #666666 !default;
+$blueprint-background-color: #eeeeee !default;
+$blueprint-border-color: #ddd !default;
 
-$link_color:         #000099               !default;
-$link_hover_color:   black                 !default;
-$link_focus_color:   $link_hover_color     !default;
-$link_active_color:  $link_color + #cc0000 !default;
-$link_visited_color: $link_color - #333333 !default;
+$link-color:         #06c                  !default;
+$link-hover-color:   #09f                  !default;
+$link-focus-color:   $link-hover-color     !default;
+$link-active-color:  lighten(adjust-hue($link-color, 75deg), 10%) !default;
+$link-visited-color: darken($link-color, 10%) !default;
 
-$feedback_border_color: #dddddd !default;
-$success_color:         #264409 !default;
-$success_bg_color:      #e6efc2 !default;
-$success_border_color:  #c6d880 !default;
-$notice_color:          #514721 !default;
-$notice_bg_color:       #fff6bf !default;
-$notice_border_color:   #ffd324 !default;
-$error_color:           #8a1f11 !default;
-$error_bg_color:        #fbe3e4 !default;
-$error_border_color:    #fbc2c4 !default;
+$feedback-border-color: #dddddd !default;
+$success-color:         #264409 !default;
+$success-bg-color:      #e6efc2 !default;
+$success-border-color:  #c6d880 !default;
+$notice-color:          #514721 !default;
+$notice-bg-color:       #fff6bf !default;
+$notice-border-color:   #ffd324 !default;
+$info-color:            #205791 !default;
+$info-bg-color:         #d5edf8 !default;
+$info-border-color:     #92cae4 !default;
+$error-color:           #8a1f11 !default;
+$error-bg-color:        #fbe3e4 !default;
+$error-border-color:    #fbc2c4 !default;
 
-$highlight_color:        yellow !default;
-$added_color:             white !default;
-$added_bg_color:        #006600 !default;
-$removed_color:           white !default;
-$removed_bg_color:      #990000 !default;
+$highlight-color:        yellow !default;
+$added-color:             white !default;
+$added-bg-color:        #006600 !default;
+$removed-color:           white !default;
+$removed-bg-color:      #990000 !default;
 
-$blueprint_table_header_color: #c3d9ff !default;
-$blueprint_table_stripe_color: #e5ecf9 !default;
+$blueprint-table-header-color: #c3d9ff !default;
+$blueprint-table-stripe-color: #e5ecf9 !default;

data/frameworks/blueprint/stylesheets/blueprint/_debug.scss

@@ -1,11 +1,11 @@
 @mixin showgrid($image: "grid.png") {
-  background: image_url($image);
+  background: image-url($image);
 }
 
-@mixin blueprint-debug($grid_image: unquote("grid.png")) {
+@mixin 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 {
-    @include showgrid($grid_image);
+    @include showgrid($grid-image);
   }
 }

data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss

@@ -4,7 +4,7 @@ $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiq
 
 // To install the fancy type plugin:
 //
-// 1. Import the fancy_type module: `@import "blueprint/fancy_type"`
+// 1. Import the fancy-type module: `@import "blueprint/fancy-type"`
 // 2. Mix in `fancy-type` to your project's body or at the top level of your stylesheet:<br>
 //    `body { @include fancy-type; }`
 @mixin fancy-type {
@@ -34,7 +34,7 @@ $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiq
   margin-left: -$offset;
 }
 
-// Reduced size type with [incremental leading](http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+// 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. 

data/frameworks/blueprint/stylesheets/blueprint/_form.scss

@@ -25,10 +25,6 @@
     &[type=text],
     &[type=password]   { margin: 0.5em 0; background-color: white; padding: 5px; }
     &.title            { font-size: 1.5em; }
-    &[type=checkbox],
-    &.checkbox,
-    &[type=radio],
-    &.radio            { position: relative; top: 0.25em; }
   }
   textarea           { margin: 0.5em 0; padding: 5px; }
   select             { margin: 0.5em 0; }
@@ -36,33 +32,35 @@
 
 @mixin blueprint-form-sizes
 (
-  $input_width: 300px,
-  $textarea_width: 390px,
-  $textarea_height: 250px
+  $input-width: 300px,
+  $textarea-width: 390px,
+  $textarea-height: 250px
 ) {
   input {
     &.text,
     &.title,
     &[type=email],
     &[type=text],
-    &[type=password] { width: $input_width; }
+    &[type=password] { width: $input-width; }
   }
-  textarea { width: $textarea_width; height: $textarea_height; }
+  textarea { width: $textarea-width; height: $textarea-height; }
 }
 
 @mixin blueprint-form-borders
 (
-  $unfocused_border_color: #bbbbbb,
-  $focus_border_color: #666666,
-  $fieldset_border_color: #cccccc
+  $unfocused-border-color: #bbbbbb,
+  $focus-border-color: #666666,
+  $fieldset-border-color: #cccccc
 ) {
   fieldset {
-    border: 1px solid $fieldset_border_color; }
+    border: 1px solid $fieldset-border-color; }
   input.text, input.title, input[type=email], input[type=text], input[type=password],
-  textarea, select {
-    border: 1px solid $unfocused_border_color;
+  textarea {
+    background-color:#fff;
+    border: 1px solid $unfocused-border-color;
     &:focus {
-      border: 1px solid $focus_border_color;
+      border: 1px solid $focus-border-color;
     }
   }
+  select { background-color:#fff; border-width:1px; border-style:solid; }
 }

data/frameworks/blueprint/stylesheets/blueprint/_grid.scss

@@ -19,19 +19,19 @@
 @import "compass/utilities/general/clearfix";
 
 // The number of columns in the grid.
-$blueprint_grid_columns: 24 !default;
+$blueprint-grid-columns: 24 !default;
 
 // The width of a column
-$blueprint_grid_width: 30px !default;
+$blueprint-grid-width: 30px !default;
 
 // The amount of margin between columns
-$blueprint_grid_margin: 10px !default;
+$blueprint-grid-margin: 10px !default;
 
 // The width of a column including the margin. With default settings this is `40px`.
-$blueprint_grid_outer_width: $blueprint_grid_width + $blueprint_grid_margin;
+$blueprint-grid-outer-width: $blueprint-grid-width + $blueprint-grid-margin;
 
 // The width of the container. With default settings this is `950px`.
-$blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns - $blueprint_grid_margin;
+$blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns - $blueprint-grid-margin;
 
 // Generates presentational class names that you can use
 // in your html to layout your pages.
@@ -45,40 +45,42 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   // A container should group all your columns
   .container {
     @include container; }
-  .column, #{enumerate("div.span", 1, $blueprint_grid_columns)} {
+  .column {
     @include 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 {
     @include last; }
   // Use these classes (or mixins) to set the width of a column.
-  @for $n from 1 to $blueprint_grid_columns {
+  @for $n from 1 to $blueprint-grid-columns {
     .span-#{$n} {
+      @extend .column;
       @include span($n); } }
-  .span-#{$blueprint_grid_columns}, div.span-#{$blueprint_grid_columns} {
-    @include span($blueprint_grid_columns);
+  .span-#{$blueprint-grid-columns} {
+    @extend .column;
+    @include span($blueprint-grid-columns);
     margin: 0; }
   input, textarea, select {
-    @for $n from 1 through $blueprint_grid_columns {
+    @for $n from 1 through $blueprint-grid-columns {
       &.span-#{$n} {
         @include span($n, true); } } }
   // Add these to a column to append empty cols.
-  @for $n from 1 to $blueprint_grid_columns {
+  @for $n from 1 to $blueprint-grid-columns {
     .append-#{$n} {
       @include append($n); } }
   // Add these to a column to prepend empty cols.
-  @for $n from 1 to $blueprint_grid_columns {
+  @for $n from 1 to $blueprint-grid-columns {
     .prepend-#{$n} {
       @include prepend($n); } }
   // Use these classes on an element to push it into the
   // next column, or to pull it into the previous column.
-  #{enumerate(".pull", 1, $blueprint_grid_columns)} {
+  #{enumerate(".pull", 1, $blueprint-grid-columns)} {
     @include pull-base; }
-  @for $n from 1 through $blueprint_grid_columns {
+  @for $n from 1 through $blueprint-grid-columns {
     .pull-#{$n} {
       @include pull-margins($n); } }
-  #{enumerate(".push", 1, $blueprint_grid_columns)} {
+  #{enumerate(".push", 1, $blueprint-grid-columns)} {
     @include push-base; }
-  @for $n from 1 through $blueprint_grid_columns {
+  @for $n from 1 through $blueprint-grid-columns {
     .push-#{$n} {
       @include push-margins($n); } }
   .prepend-top {
@@ -92,7 +94,7 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 // 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.
 @mixin container {
-  width: $blueprint_container_size;
+  width: $blueprint-container-size;
   margin: 0 auto;
   @include clearfix; }
 
@@ -111,7 +113,7 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 //
 // This mixin is especially useful for aligning tables to the grid.
 @mixin span($n, $override: false) {
-  $width: $blueprint_grid_width * $n + $blueprint_grid_margin * ($n - 1);
+  $width: $blueprint-grid-width * $n + $blueprint-grid-margin * ($n - 1);
   @if $override {
     width: $width !important; }
   @else {
@@ -134,19 +136,19 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   @if $last {
     @include last; }
   @else {
-    margin-right: $blueprint_grid_margin; }
+    margin-right: $blueprint-grid-margin; }
   * html & {
     overflow-x: hidden; } }
 
 // Mixin to a column to append n empty columns to the right
 // by adding right padding to the column.
 @mixin append($n) {
-  padding-right: $blueprint_grid_outer_width * $n; }
+  padding-right: $blueprint-grid-outer-width * $n; }
 
 // Mixin to a column to append n empty columns to the left
 // by adding left padding to the column.
 @mixin prepend($n) {
-  padding-left: $blueprint_grid_outer_width * $n; }
+  padding-left: $blueprint-grid-outer-width * $n; }
 
 // Adds trailing margin.
 @mixin append-bottom($amount: 1.5em) {
@@ -174,9 +176,9 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 // to reduce the amount of generated CSS.
 @mixin pull-margins($n, $last: false) {
   @if $last {
-    margin-left: -$blueprint_grid_outer_width * $n + $blueprint_grid_margin; }
+    margin-left: -$blueprint-grid-outer-width * $n + $blueprint-grid-margin; }
   @else {
-    margin-left: -$blueprint_grid_outer_width * $n; } }
+    margin-left: -$blueprint-grid-outer-width * $n; } }
 
 // Moves a column `n` columns to the left.
 //
@@ -207,11 +209,11 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   @include pull-margins($n, $last); }
 
 @mixin push-base {
-  @include float-right;
+  @include float-left;
   position: relative; }
 
 @mixin push-margins($n) {
-  margin: 0 (-$blueprint_grid_outer_width * $n) 1.5em $blueprint_grid_outer_width * $n; }
+  margin: 0 (-$blueprint-grid-outer-width * $n) 1.5em $blueprint-grid-outer-width * $n; }
 
 // mixin to a column to push it n columns to the right
 @mixin push($n) {
@@ -219,21 +221,21 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   @include push-margins($n); }
 
 // Border on right hand side of a column.
-@mixin border($border_color: #eeeeee, $border_width: 1px) {
-  padding-right: $blueprint_grid_margin / 2 - $border_width;
-  margin-right: $blueprint_grid_margin / 2;
-  border-right: #{$border_width} solid #{$border_color}; }
+@mixin border($border-color: $blueprint-border-color, $border-width: 1px) {
+  padding-right: $blueprint-grid-margin / 2 - $border-width;
+  margin-right: $blueprint-grid-margin / 2;
+  border-right: #{$border-width} solid #{$border-color}; }
 
 // Border with more whitespace, spans one column.
-@mixin colborder($border_color: #eeeeee, $border_width: 1px) {
-  padding-right: floor(($blueprint_grid_width + 2 * $blueprint_grid_margin - $border_width) / 2);
-  margin-right: ceil(($blueprint_grid_width + 2 * $blueprint_grid_margin - $border_width) / 2);
-  border-right: #{$border_width} solid #{$border_color}; }
+@mixin colborder($border-color: $blueprint-border-color, $border-width: 1px) {
+  padding-right: floor(($blueprint-grid-width + 2 * $blueprint-grid-margin - $border-width) / 2);
+  margin-right: ceil(($blueprint-grid-width + 2 * $blueprint-grid-margin - $border-width) / 2);
+  border-right: #{$border-width} solid #{$border-color}; }
 
 // Mixin this to an hr to make a horizontal ruler across a column.
-@mixin colruler($border_color: #dddddd) {
-  background: $border_color;
-  color: $border_color;
+@mixin colruler($border-color: #dddddd) {
+  background: $border-color;
+  color: $border-color;
   clear: both;
   float: none;
   width: 100%;