Bumped to 2.1.3

danielchikaka · Dec 6, 2012 · a7756f0 · a7756f0
1 parent 7c5bc1e
commit a7756f0
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 39 deletions.
diff --git a/bourbon-compass.gemspec b/bourbon-compass.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   # Release Specific Information
-  s.version = "2.1.2"
-  s.date = "2012-11-02"
+  s.version = "2.1.3"
+  s.date = "2012-12-05"
 
   # Gem Details
   s.name = "bourbon-compass"
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/thoughtbot/bourbon"
 
   # Gem Files
-  s.files = %w(readme.md)
   s.files += Dir.glob("lib/**/*.*")
   s.files += Dir.glob("stylesheets/**/*.*")
 

diff --git a/readme.md b/readme.md
diff --git a/stylesheets/bourbon/_bourbon.scss b/stylesheets/bourbon/_bourbon.scss
@@ -21,10 +21,11 @@
 @import "css3/box-sizing";
 @import "css3/columns";
 @import "css3/flex-box";
+@import "css3/font-face";
+@import "css3/hidpi-media-query";
 @import "css3/image-rendering";
 @import "css3/inline-block";
 @import "css3/linear-gradient";
-@import "css3/prefixer";
 @import "css3/radial-gradient";
 @import "css3/transform";
 @import "css3/transition";
@@ -33,10 +34,9 @@
 // Addons & other mixins
 @import "addons/button";
 @import "addons/clearfix";
-@import "addons/font-face";
 @import "addons/font-family";
 @import "addons/hide-text";
 @import "addons/html5-input-types";
 @import "addons/position";
+@import "addons/prefixer";
 @import "addons/timing-functions";
-@import "addons/hidpi-media-query";
diff --git a/stylesheets/bourbon/addons/_clearfix.scss b/stylesheets/bourbon/addons/_clearfix.scss
@@ -12,11 +12,11 @@
 //    }
 
 @mixin clearfix {
-  zoom: 1;
+  *zoom: 1;
 
   &:before,
   &:after {
-    content: "";
+    content: " ";
     display: table;
   }
 

diff --git a/stylesheets/bourbon/css3/_prefixer.scss → stylesheets/bourbon/addons/_prefixer.scss b/stylesheets/bourbon/css3/_prefixer.scss → stylesheets/bourbon/addons/_prefixer.scss
diff --git a/stylesheets/bourbon/addons/_font-face.scss → stylesheets/bourbon/css3/_font-face.scss b/stylesheets/bourbon/addons/_font-face.scss → stylesheets/bourbon/css3/_font-face.scss
diff --git a/...ts/bourbon/addons/_hidpi-media-query.scss → ...eets/bourbon/css3/_hidpi-media-query.scss b/...ts/bourbon/addons/_hidpi-media-query.scss → ...eets/bourbon/css3/_hidpi-media-query.scss
diff --git a/stylesheets/bourbon/lib/bourbon.rb b/stylesheets/bourbon/lib/bourbon.rb
@@ -1,3 +1,7 @@
+# CodeKit needs relative paths
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
 require "bourbon/generator"
 
 module Bourbon