Permalink
Browse files

Merge branch 'release/1.2'

  • Loading branch information...
2 parents 5e6cd11 + 2309ab8 commit 23093f17ead5c5dbb217d97b81910ec15ecf468c @zombor committed Dec 4, 2010
View
@@ -0,0 +1,5 @@
+Copyright (c) 2010 Jeremy Bush <contractfrombelow@gmail.com> and Andy Taylor <hello@andytlr.com>
+
+This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Australia License.
+
+http://creativecommons.org/licenses/by-sa/3.0/au/legalcode
View
@@ -30,6 +30,6 @@ The same applies for the row class all the col classes. Make sure you use the el
To make a mobile stylesheet, simply:
-@import "1140/mobile";
+@import "eleven40/mobile";
This will include the mobile styles that will overload the default screen styles.
View
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
# Release Specific Information
- s.version = "1.1"
+ s.version = "1.2"
s.date = "2010-12-03"
# Gem Details
@@ -13,11 +13,13 @@ Gem::Specification.new do |s|
# Gem Files
s.files = %w(README.md)
+ s.files += Dir.glob("lib/**/*.*")
s.files += Dir.glob("stylesheets/**/*.*")
s.files += Dir.glob("templates/**/*.*")
# Gem Bookkeeping
s.has_rdoc = false
+ s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.6}
s.add_dependency("compass", [">= 0.10.0.rc3"])
end
View
@@ -0,0 +1,2 @@
+require 'compass'
+Compass::Frameworks.register("eleven40", :path => "#{File.dirname(__FILE__)}/..")
File renamed without changes.
@@ -1,6 +1,6 @@
-@import "1140/reset";
-@import "1140/base";
-@import "1140/ie";
-@import "1140/typography";
+@import "eleven40/reset";
+@import "eleven40/base";
+@import "eleven40/ie";
+@import "eleven40/typography";
@import "partials/layout";
@@ -1,5 +1,6 @@
description "eleven40 compass extension"
+stylesheet 'partials/_layout.scss'
stylesheet 'screen.scss', :media => 'screen'
stylesheet 'ie.scss', :media => 'screen', :condition => "lt IE 8"
stylesheet 'mobile.scss', :media => 'handheld, only screen and (max-width: 767px)'
@@ -1,6 +1,6 @@
-@import "1140/reset";
-@import "1140/base";
-@import "1140/mobile";
-@import "1140/typography";
+@import "eleven40/reset";
+@import "eleven40/base";
+@import "eleven40/mobile";
+@import "eleven40/typography";
@import "partials/layout";
@@ -1,5 +1,5 @@
-@import "1140/reset";
-@import "1140/base";
-@import "1140/typography";
+@import "eleven40/reset";
+@import "eleven40/base";
+@import "eleven40/typography";
@import "partials/layout";
@@ -1,6 +1,6 @@
-@import "1140/reset";
-@import "1140/smallscreen";
-@import "1140/base";
-@import "1140/typography";
+@import "eleven40/reset";
+@import "eleven40/smallscreen";
+@import "eleven40/base";
+@import "eleven40/typography";
@import "partials/layout";

0 comments on commit 23093f1

Please sign in to comment.