Merge pull request #11 from andimal/v0.4.3

v0.4.3

README.md

@@ -11,7 +11,7 @@ TODO: Write usage instructions here
 
 Add this line to your application's Gemfile:
 
-    gem 'manhattan', github: 'kohactive/manhattan'
+    gem 'manhattan-sass'
 
 And then execute:
 

app/assets/stylesheets/manhattan.css.sass → app/assets/stylesheets/manhattan.sass

@@ -5,7 +5,7 @@
 // Grid Variables
 @import manhattan/variables
 
-// // Mixins and the grid
+// Mixins and the grid
 @import manhattan/mixins
 @import manhattan/grid
 @import manhattan/utilities

app/assets/stylesheets/manhattan/_mixins.css.sass → app/assets/stylesheets/manhattan/_mixins.sass

@@ -39,8 +39,8 @@
 @mixin omega-core($size)
   @for $i from 1 through $grid-columns
     .omega-#{$size}-#{$i}
-      [class^="col-"],
-      [class*=" col-"]
+      > [class^="col-"],
+      > [class*=" col-"]
         @include omega(#{$i}n)
 
 

lib/manhattan/version.rb

@@ -1,3 +1,3 @@
 module Manhattan
-  VERSION = "0.3.1"
+  VERSION = "0.4.3"
 end

manhattan.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'manhattan/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "manhattan"
+  spec.name          = "manhattan-sass"
   spec.version       = Manhattan::VERSION
-  spec.authors       = ["John Koht"]
-  spec.email         = ["[email protected]"]
+  spec.authors       = ["John Koht", "Andy Richardson"]
+  spec.email         = ["[email protected]", "[email protected]"]
   spec.description   = "A powerful, mobile-first responsive framework built on Bourbon Neat."
   spec.summary       = "A powerful, mobile-first responsive framework built on Bourbon Neat."
-  spec.homepage      = "https://github.com/johnkoht/manhattan"
+  spec.homepage      = "http://kohactive.github.io/manhattan/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "sass", ">= 3.0"
-  spec.add_dependency "bourbon", ">= 2.1"
-  spec.add_dependency "neat", ">= 1.4.0"
+  spec.add_dependency "bourbon", "~> 4.2"
+  spec.add_dependency "neat", "~> 1.7"
+  spec.add_dependency "sass", "~> 3.4"
 end