Skip to content

Commit

Permalink
Update Sass (3.2.0).
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbayerlein committed Aug 13, 2012
1 parent 886a7a2 commit 43432be
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 61 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.mkdn
Expand Up @@ -55,7 +55,7 @@ Other:
* Fix bug in susy-background-grid for fluid sites.
* Fix minor bug with repeated 'display' properties.
* Lower Compass dependency to 0.12.2
* Add Sass dependency at 3.2.0.alpha.247
* Add Sass dependency at 3.2.0

### Upgrade:

Expand Down
9 changes: 0 additions & 9 deletions README.md
Expand Up @@ -27,15 +27,6 @@ we just do the math and get out of your way.
- [Sites using Susy](http://susy.oddbird.net/sites-using-susy/)
- [Twitter @CompassSusy](http://twitter.com/compasssusy/)

## Why is 1.0 a release candidate?

Susy 1.0 is stable and tested, all the features are in,
and we're ready to launch.
But our 1.0 depends on unreleased Sass features.
We think those features are stable as well,
and we'll do what it takes to stay on top of any changes they make,
but we can't officially land until they do.

## Contributing

We love contributions,
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -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", "sass >=3.2.0.alpha.247"]
p.dependencies = ["compass >=0.12.2", "sass >=3.2.0"]
end

rescue LoadError => boom
Expand Down
2 changes: 1 addition & 1 deletion docs/source/guides/getting-started.html.md
Expand Up @@ -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` and `/sass-3.2.0.alpha.247`)
(on my machine: `/Library/Ruby/Gems/1.8/gems/compass-0.12.2` and `/sass-3.2.0`)
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.
Expand Down
11 changes: 0 additions & 11 deletions docs/source/index.html.md
Expand Up @@ -43,17 +43,6 @@
</ul>
</div>
</section>
<section class="why">
<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 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.
We'll make sure the final upgrade is as painless as possible.
</p>
</section>
<figure class="ag-test">
<figcaption>
<p>10-column <a href="http://oocss.org/grids_docs.html">complex nested grid AG test</a></p>
Expand Down
42 changes: 7 additions & 35 deletions docs/source/stylesheets/_modules/_intro.scss
Expand Up @@ -12,7 +12,7 @@
.intro {
@extend .serif-type;
@include trailer(1,$medpx);
p {
p {
&:first-child { color: $susy-bodycopy-dark-20; }
&:last-child { font-style: italic; }
}
Expand All @@ -26,24 +26,24 @@
@include rhythm-borders(1px,1);
border-color: $susy-background-dark-20;
background: $susy-background-dark-10;
> div {
> div {
@include clearfix;
@include trailer;
@include trailer;
}
@include at-breakpoint($break) {
@include span-columns(4 omega);
}
h2 {
@extend .caps;
letter-spacing: .1em;
a {
a {
@extend .icon;
@include font-icon-image($icon-pushpin);
font-weight: bold;
&::before { margin-right: $xxxsmallpx; }
}
}
ul {
ul {
list-style: circle;
padding-left: rhythm(1);
}
Expand All @@ -60,38 +60,10 @@
}
}

.why {
@extend .serif-type;
@include h-borders(3px,1,$medpx);
@include trailer(1,$medpx);
clear: both;
border-color: $susy-highlight;
a {
#{$link} {
font-family: $caps-stack;
text-transform: uppercase;
}
}
@include at-breakpoint($break) {
@include trailer(2,$medpx);
@include h-borders(3px,1.5,$medpx);
@include pad(2,2);
position: relative;
@include font-icon($icon-question-sign) {
@include adjust-font-size-to($xxxlargepx);
position: absolute;
left: 0;
top: rhythm(-.5,$xxxlargepx);
color: $susy-background-dark-5;
z-index: -1;
}
}
}

.andmore {
@extend .serif-type;
p:last-child { font-style: italic; }
@include at-breakpoint(50em 10) {
@include span-columns(5 omega,10);
@include at-breakpoint(50em 10) {
@include span-columns(5 omega,10);
}
}
6 changes: 3 additions & 3 deletions susy.gemspec
Expand Up @@ -24,13 +24,13 @@ Gem::Specification.new do |s|

if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<compass>, [">= 0.12.2"])
s.add_runtime_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
s.add_runtime_dependency(%q<sass>, [">= 3.2.0"])
else
s.add_dependency(%q<compass>, [">= 0.12.2"])
s.add_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
s.add_dependency(%q<sass>, [">= 3.2.0"])
end
else
s.add_dependency(%q<compass>, [">= 0.12.2"])
s.add_dependency(%q<sass>, [">= 3.2.0.alpha.247"])
s.add_dependency(%q<sass>, [">= 3.2.0"])
end
end

0 comments on commit 43432be

Please sign in to comment.