diff --git a/doc-src/Gemfile b/doc-src/Gemfile
index ea0c8106..6e544416 100644
--- a/doc-src/Gemfile
+++ b/doc-src/Gemfile
@@ -12,8 +12,9 @@ gem 'nokogiri'
gem 'coderay'
gem 'haml'
gem 'rake'
+gem 'activesupport', '~> 3.0.10', :require => 'active_support/inflector'
gem 'compass', :path => ".."
-gem 'compass-theme', '~> 0.0.1'
+gem 'compass-theme', :path => '../../compass-theme' #:git => 'git://github.com/Compass/compass-theme.git'
# gem 'compass-susy-plugin', ">=0.7.0.pre8"
# gem 'css-slideshow', "0.2.0"
gem 'json'
diff --git a/doc-src/Rules b/doc-src/Rules
index ee84cd46..884c7901 100644
--- a/doc-src/Rules
+++ b/doc-src/Rules
@@ -63,6 +63,7 @@ end
compile '*' do
if item[:extension] == "markdown"
+ filter :erb
filter :rdiscount
elsif item[:extension] == "haml"
filter :haml, :ugly => true
diff --git a/doc-src/content/help/tutorials/spriting.markdown b/doc-src/content/help/tutorials/spriting.markdown
index b5c3d6ba..f779cedd 100644
--- a/doc-src/content/help/tutorials/spriting.markdown
+++ b/doc-src/content/help/tutorials/spriting.markdown
@@ -5,12 +5,16 @@ crumb: Spriting
classnames:
- tutorial
---
+
# Spriting with Compass
Spriting has never been easier with Compass. You place the sprite images in a folder,
import them into your stylesheet, and then you can use the sprite in your selectors in one
of several convenient ways.
+## Sprite Tutorial Contents
+<%= sprite_tutorial_links(true) %>
+
## Setup
For this tutorial, let's imagine that in your project's image folder there are four icons:
@@ -23,6 +27,9 @@ For this tutorial, let's imagine that in your project's image folder there are f
Each is an icon that is 32px square.
## Basic Usage
+
+****Note**: The use of `icon` is only for this example, "icon" represents the folder name that contains your sprites.
+
The simplest way to use these icon sprites is to let compass give you a class for each sprite:
@import "icon/*.png";
@@ -45,30 +52,12 @@ You can now apply the `icon-XXX` classes to your markup as needed.
Let's go over what happened there. The import statement told compass to [generate a
stylesheet that is customized for your sprites](https://gist.github.com/729507). This
-stylesheet is [magic](#magic-imports), it is not written to disk, and it can be customized
+stylesheet is [magic](/help/tutorials/spriting/magic-imports), it is not written to disk, and it can be customized
by setting configuration variables before you import it. See the section below on
-[Customization Options](#customization-options). The goal of this stylesheet is to provide a
+[Customization Options](/help/tutorials/spriting/customization). The goal of this stylesheet is to provide a
simple naming convention for your sprites so that you they are easy to remember and use. You
should never have to care what the is name of the generated sprite map, nor where a sprite
is located within it.
-
-
-## Layout Control
-
-Set the `$-layout` variable to the preferred layout method.
-
-* vertical - default
-* horizontal - lays images out side by side
-* diagonal - lays images out corner to corner none of the spacing of padding options are taken into account
-* smart - lays the images out using a bin packing algorithm which allows for much smaller surface areas in your sprite files - does not support spacing or padding
-
-Example:
-
- $icon-layout:horizontal;
- @import "icon/*.png";
-
- $dropcap-layout:diagonal
- @import "dropcap/*.png";
## Selector Control
@@ -119,102 +108,6 @@ might want to avoid it. For instance, if your sprite map has more than about 20
sprites, you may find that hand crafting the import will speed up compilation times. See
the section on [performance considerations](#performance) for more details.
-
-## Magic Selectors
-
-If you want to add selectors for your sprites, it's easy todo by adding `_active` `_target` or `_hover` to the file name, In the example below we have a sprite directory that looks like:
-
-* `selectors/ten-by-ten.png`
-* `selectors/ten-by-ten_hover.png`
-* `selectors/ten-by-ten_active.png`
-* `selectors/ten-by-ten_target.png`
-
-Now in our sass file we add:
-
- @import "selectors/*.png";
-
- a {
- @include selectors-sprite(ten-by-ten)
- }
-
-And your stylesheet will compile to:
-
- .selectors-sprite, a {
- background: url('/selectors-sedfef809e2.png') no-repeat;
- }
-
- a {
- background-position: 0 0;
- }
- a:hover, a.ten-by-ten_hover, a.ten-by-ten-hover {
- background-position: 0 -20px;
- }
- a:target, a.ten-by-ten_target, a.ten-by-ten-target {
- background-position: 0 -30px;
- }
- a:active, a.ten-by-ten_active, a.ten-by-ten-active {
- background-position: 0 -10px;
- }
-
-Alternatively you can use the `@include all-selectors-sprites;` after the import and get the following output:
-
- .selectors-sprite, .selectors-ten-by-ten {
- background: url('/selectors-sedfef809e2.png') no-repeat;
- }
-
- .selectors-ten-by-ten {
- background-position: 0 0;
- }
- .selectors-ten-by-ten:hover, .selectors-ten-by-ten.ten-by-ten_hover, .selectors-ten-by-ten.ten-by-ten-hover {
- background-position: 0 -20px;
- }
- .selectors-ten-by-ten:target, .selectors-ten-by-ten.ten-by-ten_target, .selectors-ten-by-ten.ten-by-ten-target {
- background-position: 0 -30px;
- }
- .selectors-ten-by-ten:active, .selectors-ten-by-ten.ten-by-ten_active, .selectors-ten-by-ten.ten-by-ten-active {
- background-position: 0 -10px;
- }
-
-
-
-
-## Customization Options
-
-### Options per Sprite Map
-
-When constructing the sprite map, the entire sprite map and it's associated stylesheet
-can be configured in the following ways. Each option is specified by setting a [configuration
-variable](/help/tutorials/configurable-variables/) before importing the sprite. The variables
-are named according to the name of the folder containing the sprites. In the examples below
-the sprites were contained within a folder called `icon`.
-
-* `$