Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update Compass, Sass. Bump version 1.0.rc.2

  • Loading branch information...
commit bf0b8150497113aa93035742b552614abc41e492 1 parent fc85ec8
@danielbayerlein danielbayerlein authored
View
16 CHANGELOG.mkdn
@@ -4,7 +4,7 @@ Susy Changelog
v1.0 [UNRELEASED]
-----------------
-This release is loaded with new features, but don't let that fool you. Susy
+This release is loaded with new features, but don't let that fool you. Susy
just became shockingly simple to use. See the [website][site] for details.
Note that the gem name has changed from `compass-susy-plugin` to `susy`.
@@ -13,7 +13,7 @@ Note that the gem name has changed from `compass-susy-plugin` to `susy`.
New Features:
-* `omega` can now be set directly through the `columns` mixin for much
+* `omega` can now be set directly through the `columns` mixin for much
more compact output.
* Create responsive grid break-points using `at-breakpoint` and `layout`.
* `container` mixin now accepts one or more grids/breakpoints as a shortcut.
@@ -40,23 +40,23 @@ Other:
* Fix bug in susy-background-grid for fluid sites.
* Fix minor bug with repeated 'display' properties.
-* Lower Compass dependency to 0.12.2.rc.0
-* Add Sass dependency at 3.2.0.alpha.237
+* Lower Compass dependency to 0.12.2
+* Add Sass dependency at 3.2.0.alpha.247
### Upgrade:
1. Uninstall `compass-susy-plugin` and install `susy` in it's place.
2. Find and replace the 5 simple "Changed API's" listed above.
3. Remove the `$context` argument from all `omega` mixins.
-4. Remove any mention of `alpha` and `full` in your code.
+4. Remove any mention of `alpha` and `full` in your code.
* Replace `full` with `clear: both;` where necessary.
5. Remove any mention of `side-gutter()`.
* This may require some refactoring, depending on your uses.
-6. [Optional] Any time 'columns' and 'omega' are declared in the same block,
- they can now be joined together. `@include columns(3); @include omega();`
+6. [Optional] Any time 'columns' and 'omega' are declared in the same block,
+ they can now be joined together. `@include columns(3); @include omega();`
can become `@include columns(3 omega)`.
-You're done! Stop worrying about all that "nested vs. root" bullshit,
+You're done! Stop worrying about all that "nested vs. root" bullshit,
and start playing with the new toys!
v0.9 [Apr 25 2011]
View
2  Rakefile
@@ -10,7 +10,7 @@ begin
p.url = "http://susy.oddbird.net/"
p.author = "Eric Meyer"
p.email = "eric@oddbird.net"
- p.dependencies = ["compass >=0.12.2.rc.0", "sass >=3.2.0.alpha.237"]
+ p.dependencies = ["compass >=0.12.2", "sass >=3.2.0.alpha.247"]
end
rescue LoadError => boom
View
2  VERSION
@@ -1 +1 @@
-1.0.rc.1
+1.0.rc.2
View
6 docs/Gemfile
@@ -1,8 +1,8 @@
source "http://rubygems.org"
-gem "middleman", "~> 3.0.0.beta.3"
-gem "susy", "~> 1.0.rc.1"
+gem "middleman", "~> 3.0.0.rc.1"
+gem "susy", "~> 1.0.rc.2"
gem "modular-scale", "~> 0.0.5"
gem "redcarpet"
gem "rack-codehighlighter", :git => "git://github.com/wbzyl/rack-codehighlighter.git"
-gem "pygments.rb"
+gem "pygments.rb"
View
60 docs/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.2.3)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
blankslate (2.1.2.4)
@@ -18,10 +18,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
- compass (0.13.alpha.0)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
- sass (~> 3.2.0.alpha.93)
+ sass (~> 3.1)
execjs (1.3.2)
multi_json (~> 1.0)
ffi (1.0.11)
@@ -32,40 +32,44 @@ GEM
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.6.0)
- listen (0.4.2)
+ listen (0.4.6)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
maruku (0.6.0)
syntax (>= 1.0.0)
- middleman (3.0.0.beta.3)
- middleman-core (= 3.0.0.beta.3)
- middleman-more (= 3.0.0.beta.3)
- middleman-core (3.0.0.beta.3)
- activesupport (~> 3.2.0)
- bundler (~> 1.0)
- i18n (~> 0.6.0)
- listen (~> 0.4.2)
- padrino-helpers (~> 0.10.6)
+ middleman (3.0.0.rc.1)
+ middleman-core (= 3.0.0.rc.1)
+ middleman-more (= 3.0.0.rc.1)
+ middleman-sprockets (= 3.0.0.rc.1)
+ middleman-core (3.0.0.rc.1)
+ activesupport (~> 3.2.4)
+ bundler (~> 1.1)
+ listen (~> 0.4.4)
rack (~> 1.4.0)
rack-test (~> 0.6.1)
- thor (~> 0.14.0)
+ thor (~> 0.14.3)
tilt (~> 1.3.1)
- middleman-more (3.0.0.beta.3)
+ middleman-more (3.0.0.rc.1)
coffee-script (~> 2.2.0)
+ coffee-script-source (~> 1.3.3)
compass (>= 0.12.1)
execjs (~> 1.3.2)
haml (>= 3.1.0)
+ i18n (~> 0.6.0)
maruku (~> 0.6.0)
- middleman-core (= 3.0.0.beta.3)
+ middleman-core (= 3.0.0.rc.1)
+ padrino-helpers (~> 0.10.6)
sass (>= 3.1.7)
+ uglifier (~> 1.2.0)
+ middleman-sprockets (3.0.0.rc.1)
+ middleman-more (= 3.0.0.rc.1)
sprockets (~> 2.1)
sprockets-sass (~> 0.8.0)
- uglifier (~> 1.2.0)
modular-scale (0.0.5)
compass (>= 0.11.5)
- multi_json (1.3.5)
- nokogiri (1.5.2)
+ multi_json (1.3.6)
+ nokogiri (1.5.5)
padrino-core (0.10.6)
activesupport (~> 3.2.0)
http_router (~> 0.10.2)
@@ -75,7 +79,7 @@ GEM
padrino-helpers (0.10.6)
i18n (~> 0.6)
padrino-core (= 0.10.6)
- pygments.rb (0.2.12)
+ pygments.rb (0.2.13)
rubypython (~> 0.5.3)
rack (1.4.1)
rack-protection (1.2.0)
@@ -91,7 +95,7 @@ GEM
rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
- sass (3.2.0.alpha.237)
+ sass (3.2.0.alpha.247)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
@@ -104,15 +108,15 @@ GEM
sprockets-sass (0.8.0)
sprockets (~> 2.0)
tilt (~> 1.1)
- susy (1.0.rc.1)
- compass (>= 0.12.2.rc.0)
- sass (>= 3.2.0.alpha.237)
+ susy (1.0.rc.2)
+ compass (>= 0.12.2)
+ sass (>= 3.2.0.alpha.247)
syntax (1.0.0)
thor (0.14.6)
tilt (1.3.3)
- uglifier (1.2.4)
+ uglifier (1.2.5)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.3)
url_mount (0.2.1)
rack
@@ -120,9 +124,9 @@ PLATFORMS
ruby
DEPENDENCIES
- middleman (~> 3.0.0.beta.3)
+ middleman (~> 3.0.0.rc.1)
modular-scale (~> 0.0.5)
pygments.rb
rack-codehighlighter!
redcarpet
- susy (~> 1.0.rc.1)
+ susy (~> 1.0.rc.2)
View
6 docs/source/guides/getting-started.html.md
@@ -2,7 +2,7 @@
title: Getting Started
class: guide
side_content: >
- <p class="version">Version <span>1.0.rc.1</span></p>
+ <p class="version">Version <span>1.0.rc.2</span></p>
<h2><a href="#start-install">Installation</a></h2>
<ul>
<li><a href="#start-compass">Compass</a></li>
@@ -222,7 +222,7 @@ Proceed at your own risk.
5. Navigate to `Contents/Resources/engines/`.
6. You will see a `compass` folder and an `scss` folder.
7. Copy the contents of the Sass and Compass files from your install into these folders.
- (on my machine: `/Library/Ruby/Gems/1.8/gems/compass-0.12.2.rc.0` and `/sass-3.2.0.alpha.237`)
+ (on my machine: `/Library/Ruby/Gems/1.8/gems/compass-0.12.2` and `/sass-3.2.0.alpha.247`)
8. Match the contents of these folders
with the contents of the corresponding folders inside CodeKit app and copy them over.
There may be a few extra items in the machine's install.
@@ -282,7 +282,7 @@ Add Susy to your ``Gemfile``
([more info on Gemfiles](http://gembundler.com/gemfile.html)):
:::ruby
- gem "susy", "~> 1.0.rc.1"
+ gem "susy", "~> 1.0.rc.2"
And finally run your bundle:
View
48 docs/source/guides/reference.html.md
@@ -2,7 +2,7 @@
title: Reference
class: guide
side_content: >
- <p class="version">Version <span>1.0.rc.1</span></p>
+ <p class="version">Version <span>1.0.rc.2</span></p>
<h2><a href="#ref-basic">Basic Usage</a></h2>
<h3><a href="#ref-basic-settings">Basic Settings</a></h3>
<ul>
@@ -87,11 +87,11 @@ side_content: >
The number of Columns in your default Grid Layout.
:::scss
- // $total-columns: <number>;
- $total-columns: 12;
+ // $total-columns: <number>;
+ $total-columns: 12;
- `<number>`: Unitless number.
-
+
#### <a href="#ref-column-width" id="ref-column-width">Column Width</a>
The width of a single Column in your Grid.
@@ -99,7 +99,7 @@ The width of a single Column in your Grid.
// $column-width: <length>;
$column-width: 4em;
-- `<length>`: Length in any unit of measurement (em, px, %, etc).
+- `<length>`: Length in any unit of measurement (em, px, %, etc).
#### <a href="#ref-gutter-width"id="ref-gutter-width">Gutter Width</a>
The space between Columns.
@@ -108,7 +108,7 @@ The space between Columns.
// $gutter-width: <length>;
$gutter-width: 1em;
-- `<length>`: Units must match `$column-width`.
+- `<length>`: Units must match `$column-width`.
#### <a href="#ref-grid-padding" id="ref-grid-padding">Grid Padding</a>
Padding on the left and right of a Grid Container.
@@ -117,8 +117,8 @@ Padding on the left and right of a Grid Container.
// $grid-padding: <length>;
$grid-padding: $gutter-width; // 1em
-- `<length>`: Units must match `$column-width`.
-
+- `<length>`: Units must match `$column-width`.
+
### <a href="#ref-basic-mixins" id="ref-basic-mixins">Basic Mixins</a>
#### <a href="#ref-container" id="ref-container">Container</a>
@@ -128,7 +128,7 @@ Establish the outer grid-containing element.
// container([$<media-layout>]*)
.page { @include container; }
-- `<$media-layout>`: Optional media-layout shortcuts
+- `<$media-layout>`: Optional media-layout shortcuts
(see '[Responsive Grids][responsive]' below).
Default: `$total-columns`.
@@ -154,7 +154,7 @@ Apply to any omega element as an override.
:::scss
// omega([<$from>])
- .gallery-image {
+ .gallery-image {
@include span-columns(3,9); // each gallery-image is 3 of 9 cols.
&:nth-child(3n) { @include omega; } // every third image completes a row.
}
@@ -192,11 +192,11 @@ Resets an element to default block behaviour.
$media-layout: 30em 12 60em;// Use 12 cols between min 30em & max 60em.
$media-layout: 60em 12 30em;// Same. Larger length will always be max-width.
$media-layout : 12 lt-ie9; // Output is included under `.lt-ie9` class,
- // for use with IE conditional comments
+ // for use with IE conditional comments
// on the <html> tag.
-**Note:**
-The IE-fallback class does not include a leading "`.`" signifier,
+**Note:**
+The IE-fallback class does not include a leading "`.`" signifier,
but is simply the class name:
"`lt-ie9`", not "`.lt-ie9`".
@@ -204,7 +204,7 @@ but is simply the class name:
#### <a href="#ref-at-breakpoint" id="ref-at-breakpoint">At-Breakpoint</a>
At a given min- or max-width Breakpoint, use a given Layout.
-
+
:::scss
// at-breakpoint(<$media-layout> [, <$font-size>]) { <@content> }
@include at-breakpoint(30em 12) {
@@ -312,7 +312,7 @@ Add columns of empty space as margin after an element.
- `<$columns>`: The number of _Columns_ to be added as `margin` after.
- `<$context>`: The _Context_.
Default: `$total-columns`.
-- `<$from>`: The origin direction of your document flow.
+- `<$from>`: The origin direction of your document flow.
Default: `$from-direction`.
#### <a href="#ref-squish" id="ref-squish">Squish</a>
@@ -324,9 +324,9 @@ Shortcut to add empty space as margin before and after an element.
- `<$pre>`: The number of _Columns_ to be added as `margin` before.
- `<$post>`: The number of _Columns_ to be added as `margin` after.
-- `<$context>`: The _Context_.
+- `<$context>`: The _Context_.
Default: `$total-columns`.
-- `<$from>`: The origin direction of your document flow.
+- `<$from>`: The origin direction of your document flow.
Default: `$from-direction`.
#### <a href="#ref-push" id="ref-push">Push</a>
@@ -367,18 +367,18 @@ Show the Susy Grid as a background-image on any container.
### <a href="#ref-helper-functions" id="ref-helper-functions">Functions</a>
-Where a mixin returns property/value pairs, functions return simple values
+Where a mixin returns property/value pairs, functions return simple values
that you can put where you want, and use for advanced math.
#### <a href="#ref-columns" id="ref-columns">Columns</a>
-Similar to [span-columns](#ref-span-columns) mixin,
+Similar to [span-columns](#ref-span-columns) mixin,
but returns the math-ready `%` multiplier.
:::scss
// columns(<$columns> [, <$context>])
.item { width: columns(3,6); }
-- `<$columns>`: The number of _Columns_ to span,
+- `<$columns>`: The number of _Columns_ to span,
- `<$context>`: The _Context_.
Default: `$total-columns`.
@@ -399,7 +399,7 @@ Total `%` space taken by Columns, including internal AND external gutters.
// space(<$columns> [, <$context>])
.item { margin-right: space(3,6); }
-- `<$columns>`: The number of _Columns_ to span,
+- `<$columns>`: The number of _Columns_ to span,
- `<$context>`: The _Context_.
Default: `$total-columns`.
@@ -456,7 +456,7 @@ The direction that Omega elements should be floated.
### <a href="#ref-compass-options" id="ref-compass-options">Compass Options</a>
#### <a href="#ref-base-font-size" id="ref-base-font-size">Base Font Size</a>
-From the [Compass Vertical Rhythm][rhythm] module,
+From the [Compass Vertical Rhythm][rhythm] module,
Susy uses your base font size to help manage
em-based media-queries.
@@ -464,8 +464,8 @@ em-based media-queries.
// $base-font-size: <px-size>;
$base-font-size: 16px;
-- `<px-size>`: Any length in `px`.
- This will not actually effect your font size
+- `<px-size>`: Any length in `px`.
+ This will not actually effect your font size
unless you use other Vertical Rhythm tools,
we just need to know.
See [Compass Docs][base-font-size] for further usage details.
View
30 docs/source/index.html.md
@@ -1,15 +1,15 @@
<div class="intro">
<p>
- The web is a responsive place,
- from your lithe <span class="amp">&</span> lively development process
- to your end-user's super-tablet-multi-magic-lap-phone.
- You need grids that are powerful yet custom,
+ The web is a responsive place,
+ from your lithe <span class="amp">&</span> lively development process
+ to your end-user's super-tablet-multi-magic-lap-phone.
+ You need grids that are powerful yet custom,
reliable yet responsive.
</p>
<p>
- Susy grids are fluid on the inside,
- ready to respond at any moment,
- but contained in the candy shell of your choice,
+ Susy grids are fluid on the inside,
+ ready to respond at any moment,
+ but contained in the candy shell of your choice,
so they respond how and when and where you want them to.
</p>
<p>
@@ -20,7 +20,7 @@
<section class="info">
<div class="v1-0">
<h2>
- <a href="https://rubygems.org/gems/susy">Version 1.0<i>.rc.1</i></a>
+ <a href="https://rubygems.org/gems/susy">Version 1.0<i>.rc.2</i></a>
</h2>
<div class="highlight">
<pre>gem install susy --pre</pre>
@@ -47,10 +47,10 @@
<h2>Why is 1.0 a release candidate?</h2>
<p>
Susy 1.0 is stable, tested, <span class="amp">&</span> feature complete;
- but our launch depends on unreleased Compass and Sass features.
+ but our launch depends on unreleased Sass features.
We think those features are stable as well,
- and you should <a href="guides/getting-started/">get started</a>
- with Susy 1.0 RC right now.
+ and you should <a href="guides/getting-started/">get started</a>
+ with Susy 1.0 RC right now.
We'll make sure the final upgrade is as painless as possible.
</p>
</section>
@@ -92,10 +92,10 @@
<p>
Quickly add media-query breakpoints for new layouts with
<a href="guides/reference/#ref-at-breakpoint">at-breakpoint</a>,
- or create your own custom math
- using Susy's full array of
- <a href="guides/reference/#ref-helper">grid helpers</a>.
- Build a one-off site in minutes,
+ or create your own custom math
+ using Susy's full array of
+ <a href="guides/reference/#ref-helper">grid helpers</a>.
+ Build a one-off site in minutes,
or create your own scalable object-oriented grid library
for large projects.
</p>
View
18 susy.gemspec
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = "susy"
- s.version = "1.0.rc.1"
+ s.version = "1.0.rc.2"
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
s.authors = ["Eric Meyer"]
- s.date = "2012-05-22"
+ s.date = "2012-06-25"
s.description = "Susy grids are fluid on the inside, ready to respond at any moment, but contained in the candy shell of your choice, so they respond how and when and where you want them to. We don't design your site or dictate your markup, we just do the math and get out of your way."
s.email = "eric@oddbird.net"
s.extra_rdoc_files = ["CHANGELOG.mkdn", "LICENSE.txt", "README.mkdn", "lib/susy.rb"]
@@ -15,21 +15,21 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Susy", "--main", "README.mkdn"]
s.require_paths = ["lib"]
s.rubyforge_project = "susy"
- s.rubygems_version = "1.8.15"
+ s.rubygems_version = "1.8.24"
s.summary = "Responsive grids for Compass."
if s.respond_to? :specification_version then
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<compass>, [">= 0.12.2.rc.0"])
- s.add_runtime_dependency(%q<sass>, [">= 3.2.0.alpha.237"])
+ s.add_runtime_dependency(%q<compass>, [">= 0.12.2"])
+ s.add_runtime_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
else
- s.add_dependency(%q<compass>, [">= 0.12.2.rc.0"])
- s.add_dependency(%q<sass>, [">= 3.2.0.alpha.237"])
+ s.add_dependency(%q<compass>, [">= 0.12.2"])
+ s.add_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
end
else
- s.add_dependency(%q<compass>, [">= 0.12.2.rc.0"])
- s.add_dependency(%q<sass>, [">= 3.2.0.alpha.237"])
+ s.add_dependency(%q<compass>, [">= 0.12.2"])
+ s.add_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.