Merge branch 'stable'

Conflicts:
	VERSION.yml
	doc-src/Gemfile.lock
	doc-src/content/CHANGELOG.markdown

.gitignore

@@ -29,4 +29,4 @@ devbin
 vendor/ruby
 vendor
 Gemfile.lock
-Compass.pkg
+*.pkg

README.markdown

@@ -15,7 +15,7 @@ A [Sass][sass]-based CSS Meta-Framework that allows you to mix and match any of
 ## Compass Provides
 
 1. A [command line tool][command_line_wiki] for managing your Sass projects.
-2. Simple integration with [Ruby-on-Rails][ruby_on_rails_wiki], [Merb][merb_wiki], [StaticMatic][static_matic_wiki], and even [non-ruby application servers][command_line_wiki].
+2. Simple integration with [Ruby-on-Rails][ruby_on_rails_wiki], [Merb][merb_wiki], [StaticMatic][staticmatic], and even [non-ruby application servers][command_line_wiki].
 3. Loads of Sass mixins to make building your website a snap.
 
 ## Quick Start
@@ -51,9 +51,9 @@ Released under a [slightly modified MIT License][license].
 [wiki]: http://github.com/chriseppstein/compass/wikis/home
 [ruby_on_rails_wiki]: http://wiki.github.com/chriseppstein/compass/ruby-on-rails-integration
 [merb_wiki]: http://wiki.github.com/chriseppstein/compass/merb-integration
-[static_matic_wiki]: http://wiki.github.com/chriseppstein/compass/staticmatic-integration
+[staticmatic]: https://github.com/mindeavor/staticmatic2
 [chris_eppstein]: http://chriseppstein.github.com
 [caring.com]: http://www.caring.com/ "Senior Care Resources"
 [license]: http://github.com/chriseppstein/compass/tree/master/LICENSE.markdown
 [susy_website]: http://www.oddbird.net/susy/
-[susy_wiki]: http://github.com/chriseppstein/compass/wikis/susy-documentation 
+[susy_wiki]: http://github.com/chriseppstein/compass/wikis/susy-documentation

doc-src/Gemfile.lock

@@ -1,18 +1,16 @@
 GIT
   remote: git://github.com/Compass/compass-theme.git
-  revision: aae72f14a1c150dffe9612623136fabdfff2b84d
+  revision: e870bc7c1d9124636280b974ccfc395eed097411
-PATH
-  remote: ..
   specs:
-    compass (0.12.0.6754be1)
+    compass-theme (0.0.2)
-      chunky_png (~> 1.2)
+      compass (~> 0.11)
-      fssm (>= 0.2.7)
+      compass-susy-plugin (~> 0.7.0)
-      sass (~> 3.1)
+      css-slideshow (= 0.2.0)
 
 PATH
   remote: ..
   specs:
-    compass (0.13.alpha.0.dc8c9b6)
+    compass (0.13.alpha.0.48d532b)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.0.alpha.93)
@@ -20,43 +18,41 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.0.12)
     asdf (0.5.0)
       rack (~> 1.2.1)
     builder (3.0.0)
     chunky_png (1.2.5)
-    coderay (0.9.7)
+    coderay (1.0.5)
-    compass-susy-plugin (0.9)
+    compass-susy-plugin (0.7.0)
-      compass (>= 0.11.1)
+      compass (>= 0.10.0)
-    cri (2.0.2)
+    cri (2.2.1)
     css-slideshow (0.2.0)
       compass (>= 0.10.0.rc3)
     css_parser (1.0.1)
     fssm (0.2.8.1)
-    haml (3.1.2)
+    haml (3.1.4)
     i18n (0.4.2)
-    json (1.5.4)
+    json (1.6.5)
-    mime-types (1.16)
+    mime-types (1.17.2)
-    nanoc3 (3.2.2)
+    nanoc (3.3.2)
-      cri (~> 2.0)
+      cri (~> 2.2)
-    nokogiri (1.4.4)
+    nanoc3 (3.3.0)
-    rack (1.2.2)
+      nanoc (>= 3.3.0)
-    rake (0.9.2)
+    nokogiri (1.5.2)
-    rb-fsevent (0.4.0)
+    rack (1.2.5)
+    rake (0.9.2.2)
+    rb-fsevent (0.9.0)
     rdiscount (1.6.8)
     ruby-prof (0.10.8)
-<<<<<<< HEAD
+    sass (3.2.0.alpha.94)
-    sass (3.2.0.alpha.93)
-=======
-    sass (3.1.15)
->>>>>>> stable
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
       tzinfo (~> 0.3.23)
     thor (0.14.6)
-    tzinfo (0.3.29)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby

doc-src/content/CHANGELOG.markdown

@@ -17,8 +17,23 @@ The Documentation for the [latest preview release](http://beta.compass-style.org
 0.13.alpha.0 (UNRELEASED)
 -------------------------
 
-* Allow numeric sprite names when not using sprite selector generation
+* Allow numeric sprite names when not using sprite selector generation capability.
-  capability.
+
+0.12.2 (UNRELEASED)
+-------------------
+
+* [Vertical Rhythm Module] Removed the `$ie-font-ratio` constatnt in
+  favor of a more clear `$browser-default-font-size` constant.
+* [Vertical Rhythm Module] The `establish-baseline` mixin now styles the
+  `<html>` element instead of the `<body>` element. This makes the
+  vertical rhythm module work better with `rem` based measurements.
+
+0.12.1 (03/14/2012)
+-------------------
+
+* Fixed a bug in font-files mime-type detection.
+* Code cleanup and better documentation for the vertical-rhythm module.
+* Add support for installing compass on Macs using a [one-click installer](https://github.com/chriseppstein/compass/downloads).
 
 0.12.rc.2 (03/11/2012)
 ----------------------

doc-src/content/index.haml

@@ -7,21 +7,23 @@ layout: homepage
 %h1#logo Compass
 %h2 <strong>Compass</strong> is an open-source <em>CSS Authoring Framework</em>.
 .overview
-  .compass
+  .info-box.compass
     %h4 Why designers love Compass.
     %ol
       %li Experience cleaner markup without presentational classes.
-      %li It’s chock full of the web’s best reusable patterns.
+      %li It’s chock full of the web’s best <a href="/reference/compass/">reusable patterns</a>.
       %li It makes creating <a href="/help/tutorials/spriting/">sprites</a> a breeze.
-      %li Compass mixins make CSS3 easy.
+      %li Compass mixins make <a href="/reference/compass/css3/">CSS3</a> easy.
+      %li Create beautiful <a href="/reference/compass/typography/vertical_rhythm/">typographic rhythms</a>.
       %li Download and create extensions with ease.
-  .sass
+  .info-box.sass
     %h4 Compass uses Sass.
     %p
       <a href="http://sass-lang.com/">Sass</a> is an extension of CSS3 which
       adds nested rules, variables, mixins, selector inheritance, and more.
       Sass generates well formatted CSS and makes your stylesheets
       easier to organize and maintain.
+  = render 'partials/ad'
 %h3 Brilliant people use Compass, including these <em>wildly talented</em> folks:
 %ul#featured_sites
   %li

doc-src/content/stylesheets/home.scss

@@ -10,8 +10,9 @@
 @import "partials/typography";
 @import "partials/main";
 @import "partials/home";
+@import "partials/ads";
 
 html.dark { @include dark-theme; }
 html.light { @include light-theme; }
 
-@import "core/clearing-classes";
+@import "core/clearing-classes";

doc-src/content/stylesheets/partials/_ads.scss

@@ -3,7 +3,7 @@
   text-align: center;
   line-height: 1.1em !important;
   @include opacity(0);
-  @include transition(opacity 1s ease-in 3s);
+  @include transition(opacity 1s ease-in 1.5s);
   &.visible {
     @include opacity(1);
   }
@@ -26,4 +26,17 @@
    a:not(.pagerankspam) { color: #222}
    img:hover { @include single-box-shadow(#222); }
  }
+ #home & {
+   float: right;
+   width: 380px;
+   margin-top: 11px;
+   .fusionimg {
+     margin: 6px 8px;
+     float: left;
+   }
+   .fusiontext {
+     padding-top: 6px;
+   }
+ }
 }
+

doc-src/layouts/homepage.haml

@@ -7,7 +7,7 @@
     %link(rel="shortcut icon" type="image/png" href="/images/compass_icon.png")
     %title
       #{@item[:title]} | Compass Documentation
-    %link{:charset => "utf-8", :href => "/stylesheets/home.css", :rel => "stylesheet", :type => "text/css"}
+    %link{:charset => "utf-8", :href => "/stylesheets/home.css?v=1", :rel => "stylesheet", :type => "text/css"}
     = render "partials/js-core"
     /[if lte IE 8]
       %link{:charset => "utf-8", :href => "/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}

doc-src/layouts/partials/ad.haml

@@ -0,0 +1,4 @@
+.advertisement
+  <script type="text/javascript">(function(){ var fusion = document.createElement('script'); fusion.src = window.location.protocol + '//adn.fusionads.net/api/1.0/ad.js?zoneid=158&rand=' + Math.floor(Math.random()*9999999); fusion.async = true; (document.head || document.getElementsByTagName('head')[0]).appendChild(fusion); })(); $(function(){ $(".advertisement").addClass("visible")});</script>
+  #fusion_ad
+    %a.pagerankspam(href="http://fusionads.net") Powered by Fusion

doc-src/layouts/partials/sidebar.haml

@@ -4,7 +4,5 @@
   - sidebar_item ||= reference_item(:stylesheet => @default_stylesheet)
   %ul= item_tree(sidebar_item, :depth => 1, :omit_self => get_var(:omit_self){true}, :heading_level => get_var(:heading_level){1}, :heading_depth => get_var(:heading_depth){10})
 
-.advertisement
+
-  <script type="text/javascript">(function(){ var fusion = document.createElement('script'); fusion.src = window.location.protocol + '//adn.fusionads.net/api/1.0/ad.js?zoneid=158&rand=' + Math.floor(Math.random()*9999999); fusion.async = true; (document.head || document.getElementsByTagName('head')[0]).appendChild(fusion); })(); $(function(){ $(".advertisement").addClass("visible")});</script>
+= render 'partials/ad'
-  #fusion_ad
-    %a.pagerankspam(href="http://fusionads.net") Powered by Fusion

frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss

@@ -9,8 +9,8 @@ $base-line-height: 24px !default;
 // Set the default border style for rhythm borders.
 $default-rhythm-border-style: solid !default;
 
-// The IE font ratio is a fact of life. Deal with it.
+// The default font size in all browsers.
-$ie-font-ratio: 16px / 100%;
+$browser-default-font-size: 16px;
 
 // Set to false if you want to use absolute pixels in sizing your typography.
 $relative-font-sizing: true !default;
@@ -55,12 +55,15 @@ $base-half-leader: $base-leader / 2;
 
 // Establishes a font baseline for the given font-size.
 @mixin establish-baseline($font-size: $base-font-size) {
-  body {
+  // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts
-    font-size: $font-size / $ie-font-ratio;
+  // whose root is set in ems. So we set the root font size in percentages of
-    @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
+  // the default font size.
+  * html {
+    font-size: 100% * ($font-size / $browser-default-font-size);
   }
-  html>body {
+  html {
     font-size: $font-size;
+    @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
   }
 }
 

lib/compass/commands.rb

@@ -4,8 +4,9 @@ end
 require 'compass/commands/registry'
 
 %w(base generate_grid_background default help list_frameworks project_base
-   update_project watch_project create_project clean_project imports installer_command
+   update_project watch_project create_project clean_project extension_command
-   print_version project_stats stamp_pattern sprite validate_project
+   imports installer_command print_version project_stats stamp_pattern
-   write_configuration interactive unpack_extension).each do |lib|
+   sprite validate_project write_configuration interactive unpack_extension
+).each do |lib|
   require "compass/commands/#{lib}"
 end

lib/compass/commands/extension_command.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+require 'compass/commands/base'
+
+module Compass
+  module Commands
+    module ExtensionsOptionParser
+      def set_options(opts)
+        opts.banner = %Q{
+Usage: compass extension install EXTENSION_NAME [options]
+       compass extension uninstall EXTENSION_NAME [options]
+       compass extension list
+
+Description:
+  Manage the list of extensions on your system.
+  Compass to all of your compass projects.
+
+Example:
+  compass extension install sassy-buttons
+  compass extension uninstall sassy-buttons
+
+}
+        super
+      end
+    end
+
+    class ExtensionCommand < Base
+
+      register :extension
+
+      class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(ExtensionsOptionParser)
+        end
+        def usage
+          option_parser([]).to_s
+        end
+        def description(command)
+          "Manage the list of compass extensions on your system"
+        end
+        def parse!(arguments)
+          {:arguments => arguments}
+        end
+      end
+      include InstallerCommand
+
+      def initialize(working_path, options)
+        super(working_path, options)
+      end
+
+      # all commands must implement perform
+      def perform
+        require 'rubygems/gem_runner'
+        Gem::GemRunner.new.run(options[:arguments])
+      end
+
+    end
+  end
+end
+

test/fixtures/stylesheets/compass/css/vertical_rhythm.css

@@ -1,9 +1,9 @@
-body {
+* html {
-  font-size: 87.5%;
+  font-size: 87.5%; }
-  line-height: 1.143em; }
 
-html > body {
+html {
-  font-size: 14px; }
+  font-size: 14px;
+  line-height: 1.143em; }
 
 .small {
   font-size: 0.857em;