diff --git a/doc-src/.compass/config.rb b/doc-src/.compass/config.rb
index f3f04ac1..44420f21 100644
--- a/doc-src/.compass/config.rb
+++ b/doc-src/.compass/config.rb
@@ -3,9 +3,9 @@ require 'susy'
require 'css-slideshow'
# Set this to the root of your project when deployed:
-http_path = "/docs"
+http_path = "/"
project_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-css_dir = "../docs/stylesheets"
+css_dir = "output/stylesheets"
sass_dir = "content/stylesheets"
images_dir = "assets/images"
javascripts_dir = "assets/javascripts"
diff --git a/doc-src/.gitignore b/doc-src/.gitignore
index 43d08e83..2a378b3c 100644
--- a/doc-src/.gitignore
+++ b/doc-src/.gitignore
@@ -1,2 +1,3 @@
bin
vendor
+output
diff --git a/doc-src/Rules b/doc-src/Rules
index 56d49d9f..d9f5e5eb 100644
--- a/doc-src/Rules
+++ b/doc-src/Rules
@@ -4,7 +4,7 @@ require 'compass'
Compass.add_configuration "#{File.dirname(__FILE__)}/.compass/config.rb"
-SITE_ROOT = "/docs"
+SITE_ROOT = ""
compile '/assets/*/' do
nil
diff --git a/doc-src/config.yaml b/doc-src/config.yaml
index ba6f66a5..4474c339 100644
--- a/doc-src/config.yaml
+++ b/doc-src/config.yaml
@@ -7,4 +7,4 @@ data_sources:
layouts_root: /assets
type: filesystem_assets
text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'php', 'rb', 'sass', 'scss', 'txt' ]
-output_dir: ..
+output_dir: output
diff --git a/doc-src/content/CHANGELOG-v0-10-0-beta.markdown b/doc-src/content/CHANGELOG-v0-10-0-beta.markdown
index f8915256..ad951b10 100644
--- a/doc-src/content/CHANGELOG-v0-10-0-beta.markdown
+++ b/doc-src/content/CHANGELOG-v0-10-0-beta.markdown
@@ -42,13 +42,13 @@ layout: article
* [Compass Core] The gradient mixins now accept a background image that will
be placed over the gradient. Credit: [Will Leinweber](http://bitfission.com/)
* [Compass Core] You can now opt out of support for specific browsers in
- the css3 module. See [the docs](/docs/reference/compass/css3/shared/)
+ the css3 module. See [the docs](/reference/compass/css3/shared/)
for more details.
0.10.0.rc4 (April 27, 2010)
---------------------------
-* Lot of new docs can be found at: [http://compass-style.org/docs/](http://compass-style.org/docs/).
+* Lot of new docs can be found at: [http://compass-style.org/](http://compass-style.org/).
* The `unobtrusive-logo` mixin is deprecated and will be removed.
If you use this, please move the source to your project.
* The CSS3 modules were refactored to share a common implementation that
@@ -84,7 +84,7 @@ layout: article
* Compass now depends on Sass 3 -- Please be prepared to upgrade.
Things won't break but you'll have a lot of deprecation warnings.
Upgrading is pretty easy thanks to the `sass-convert` tool. See the
- [Sass Changelog](http://beta.sass-lang.com/docs/yardoc/file.SASS_CHANGELOG.html)
+ [Sass Changelog](http://beta.sass-lang.com/yardoc/file.SASS_CHANGELOG.html)
for more information.
* All compass stylesheets are now written in the SCSS syntax,
if you import compass framework stylesheets with an explicit
diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index cf839acb..cfea1be0 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -8,11 +8,11 @@ COMPASS CHANGELOG
=================
Upgrading compass is really easy.
-Don't let all these details [scare you...](/docs/tutorials/upgrading/im-scared/)
+Don't let all these details [scare you...](/tutorials/upgrading/im-scared/)
-The Documentation for the [latest stable release](http://compass-style.org/docs/):
+The Documentation for the [latest stable release](http://compass-style.org/):
-The Documentation for the [latest preview release](http://beta.compass-style.org/docs/)
+The Documentation for the [latest preview release](http://beta.compass-style.org/)
0.11.alpha.1 (11/15/2010)
---------------------------
@@ -58,7 +58,7 @@ Our CSS3 module makes writing CSS3 today almost as easy as it will be when all
the browsers officially support the new features. The second version of the
compass CSS module brings the API up to date with developments over the past
6 to 9 months of browser changes and more closely matching the most recent CSS
-specifications. [Upgrade guide](/docs/tutorials/upgrading/css3-v2/). Summary of changes.
+specifications. [Upgrade guide](/tutorials/upgrading/css3-v2/). Summary of changes.
* Support for multiple box shadows and text shadows
* Support for 2d and 3d transforms
@@ -156,7 +156,7 @@ specifications. [Upgrade guide](/docs/tutorials/upgrading/css3-v2/). Summary of
* Can now set `$padding` to `false` to make the `horizontal-list` mixin skip the
padding properties.
* It is now possible to disable support for legacy IE browsers.
- See [the docs](/docs/reference/compass/support/) for more information.
+ See [the docs](/reference/compass/support/) for more information.
0.10.5 (08/29/2010)
-------------------
@@ -179,7 +179,7 @@ specifications. [Upgrade guide](/docs/tutorials/upgrading/css3-v2/). Summary of
------------------
* [Rails] Fixed a bug introduced in 0.10.3 that caused rails applications using the old configuration file (config/compass.config) to break.
-* [Extensions] Make it easier to create manifest files by allowing template files to be discovered. See the Manifest Declarations section of [extensions tutorial](http://compass-style.org/docs/tutorials/extensions/) for details.
+* [Extensions] Make it easier to create manifest files by allowing template files to be discovered. See the Manifest Declarations section of [extensions tutorial](http://compass-style.org/tutorials/extensions/) for details.
* [Rails] Don't install configuration files when installing extensions.
* [Compass Core] All url helpers now accept a second argument that when true will cause only the path to be emitted. This allows the url helpers to be used with IE filters.
@@ -198,7 +198,7 @@ This will update your compass initializer file.
* Add missing clearfix import to horizontal-list.
* Emit less css for inline lists with the same result.
-* New helper `opposite-position($position)` returns the opposite value of a position. [Documentation](http://compass-style.org/docs/reference/compass/helpers/constants/)
+* New helper `opposite-position($position)` returns the opposite value of a position. [Documentation](http://compass-style.org/reference/compass/helpers/constants/)
* Allow horizontal lists to be floated to the right.
* Bugfix for inline-font-files helper.
* `+font-face` mixin no longer uses `$postscript` name or `$style` type variables, in favor of the Paul Irish [smiley bulletproof technique](http://paulirish.com/2009/bulletproof-font-face-implementation-syntax/). Older declarations will still work, but will not apply the variables and will display a deprecation warning.
@@ -214,7 +214,7 @@ This will update your compass initializer file.
* Support for inputs of type email.
### Extensions
-* Extensions can now create empty directories with the `directory` directive. [Docs](http://compass-style.org/docs/tutorials/extensions/).
+* Extensions can now create empty directories with the `directory` directive. [Docs](http://compass-style.org/tutorials/extensions/).
* It's now easier to load extensions from a configuration file using the `load` and `discover` directives.
### Rails
@@ -253,7 +253,7 @@ This is a bug fix release. [Details on Github.](http://github.com/chriseppstein/
0.10.0 (May 10, 2010)
---------------------
-This changelog entry is condensed from a very long beta release. You can read [the 0.10.0 beta release notes here](/docs/CHANGELOG-v0-10-0-beta/).
+This changelog entry is condensed from a very long beta release. You can read [the 0.10.0 beta release notes here](/CHANGELOG-v0-10-0-beta/).
### Gem Location
@@ -267,7 +267,7 @@ installed from github, please remove it:
* Compass now depends on Sass 3 -- Please be prepared to upgrade.
Things won't break but you'll have a lot of deprecation warnings.
Upgrading is pretty easy thanks to the `sass-convert` tool. See the
- [Sass Changelog](http://sass-lang.com/docs/yardoc/file.SASS_CHANGELOG.html)
+ [Sass Changelog](http://sass-lang.com/yardoc/file.SASS_CHANGELOG.html)
for more information.
* All compass stylesheets are now written in the SCSS syntax,
if you import compass framework stylesheets with an explicit
@@ -351,7 +351,7 @@ installed from github, please remove it:
for both arguments instead of just the first
* There is no longer any outline on unstyled links in the :active and :focused states.
* New CSS3 Compatibility Mixins. You can import them all with `@import compass/css3.sass`
- Read the [documentation][http://compass-style.org/docs/reference/compass/css3/].
+ Read the [documentation][http://compass-style.org/reference/compass/css3/].
* The import for `+inline-block` has moved from "compass/utilities/general/inline_block"
to "compass/css3/inline-block".
* The import for `+opacity` has moved from "compass/utilities/general/opacity"
@@ -412,7 +412,7 @@ installed from github, please remove it:
### Miscellaneous:
-* Lot of new docs can be found at: [http://compass-style.org/docs/](http://compass-style.org/docs/).
+* Lot of new docs can be found at: [http://compass-style.org/](http://compass-style.org/).
* The compass configuration object is no longer a singleton, this makes it
possible for other ruby software to manage multiple compass projects at a
time.
@@ -985,6 +985,6 @@ Almost definitely. Please let me know if you encounter any problems and I'll get
[der-rich]: http://github.com/der-rich
[adamstac]: http://github.com/adamstac
[ttilley]: http://github.com/ttilley
-[inline-block-list]: http://compass-style.org/docs/reference/compass/utilities/lists/inline-block-list/
-[html5-reset]: http://compass-style.org/docs/reference/compass/reset/utilities/#mixin-reset-html5
+[inline-block-list]: http://compass-style.org/reference/compass/utilities/lists/inline-block-list/
+[html5-reset]: http://compass-style.org/reference/compass/reset/utilities/#mixin-reset-html5
[blueprint_10_change]: https://github.com/chriseppstein/compass/compare/a05e1ee7c0a1e4c0f0595a8bb812daa47872e476...864780969d872a93b1fd3b4f39f29dd9f0c3fe75
\ No newline at end of file
diff --git a/doc-src/content/copyright.markdown b/doc-src/content/copyright.markdown
index 71dc6613..a4747179 100644
--- a/doc-src/content/copyright.markdown
+++ b/doc-src/content/copyright.markdown
@@ -7,4 +7,4 @@ layout: article
Compass Documentation
by Christopher M. Eppstein
is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License.
-Permissions beyond the scope of this license may be available at http://compass-style.org/docs/copyright/.
+Permissions beyond the scope of this license may be available at http://compass-style.org/copyright/.
diff --git a/doc-src/content/frameworks.haml b/doc-src/content/frameworks.haml
index c1d186f7..6003c867 100644
--- a/doc-src/content/frameworks.haml
+++ b/doc-src/content/frameworks.haml
@@ -48,7 +48,7 @@ crumb: Plugins and frameworks
%a
http://blueprintcss.org/
%td
- %a{:href => "/docs/reference/blueprint/"}
+ %a{:href => "/reference/blueprint/"}
Blueprint docs
%tr
%td YUI
@@ -152,7 +152,7 @@ crumb: Plugins and frameworks
Sass Libraries
%p
Libraries are simply Sass stylesheets or
- %a{ :href => "http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials" }
+ %a{ :href => "http://sass-lang.com/yardoc/file.SASS_REFERENCE.html#partials" }
partials
\.
%ul
diff --git a/doc-src/content/reference/blueprint/print.haml b/doc-src/content/reference/blueprint/print.haml
index 9209f572..43fcf980 100644
--- a/doc-src/content/reference/blueprint/print.haml
+++ b/doc-src/content/reference/blueprint/print.haml
@@ -18,4 +18,4 @@ classnames:
to `display: none;` in your printed page.
See the [compass print utilities][pr_utils] for related functionality.
- [pr_utils]: /docs/reference/compass/utilities/print/
+ [pr_utils]: /reference/compass/utilities/print/
diff --git a/doc-src/content/reference/compass/css3.haml b/doc-src/content/reference/compass/css3.haml
index ed0f77ee..b47ec404 100644
--- a/doc-src/content/reference/compass/css3.haml
+++ b/doc-src/content/reference/compass/css3.haml
@@ -15,11 +15,11 @@ layout: core
%p
The CSS3 module provides cross-browser mixins for CSS properties
introduced in CSS3, for example
- border-radius
- and text-shadow.
+ border-radius
+ and text-shadow.
%p
What rendering engines you support for the experimental css properties is governed by
- the configurable variables defined in the browser
+ the configurable variables defined in the browser
support module.
%h3 Importing the Entire CSS3 Library
%p
diff --git a/doc-src/content/reference/compass/css3/box_shadow.haml b/doc-src/content/reference/compass/css3/box_shadow.haml
index be857af9..3cc4c455 100644
--- a/doc-src/content/reference/compass/css3/box_shadow.haml
+++ b/doc-src/content/reference/compass/css3/box_shadow.haml
@@ -14,4 +14,4 @@ classnames:
- render 'reference' do
%p.warning
This import is deprecated. Please import
- box-shadow-v2 instead.
\ No newline at end of file
+ box-shadow-v2 instead.
\ No newline at end of file
diff --git a/doc-src/content/reference/compass/css3/pie.haml b/doc-src/content/reference/compass/css3/pie.haml
index 7d47da65..f124e52d 100644
--- a/doc-src/content/reference/compass/css3/pie.haml
+++ b/doc-src/content/reference/compass/css3/pie.haml
@@ -38,7 +38,7 @@ classnames:
* border-radius
* box-shadow
* border-image
- * background (in the form of -pie-background, use the [background mixin](/docs/reference/compass/css3/images/#mixin-background))
+ * background (in the form of -pie-background, use the [background mixin](/reference/compass/css3/images/#mixin-background))
Additionally, PIE supports the following CSS3 features:
diff --git a/doc-src/content/reference/compass/css3/text_shadow.haml b/doc-src/content/reference/compass/css3/text_shadow.haml
index 22fce181..8f4052f2 100644
--- a/doc-src/content/reference/compass/css3/text_shadow.haml
+++ b/doc-src/content/reference/compass/css3/text_shadow.haml
@@ -14,5 +14,5 @@ classnames:
- render 'reference' do
%p.warning
This import is deprecated. Please import
- text-shadow-v2
+ text-shadow-v2
instead.
diff --git a/doc-src/content/reference/compass/css3/transform.haml b/doc-src/content/reference/compass/css3/transform.haml
index 0cb41904..144b7457 100644
--- a/doc-src/content/reference/compass/css3/transform.haml
+++ b/doc-src/content/reference/compass/css3/transform.haml
@@ -14,4 +14,4 @@ classnames:
- render 'reference' do
%p.warning
This import is deprecated. Please import
- transform-v2 instead.
+ transform-v2 instead.
diff --git a/doc-src/content/reference/compass/helpers.haml b/doc-src/content/reference/compass/helpers.haml
index fc08fb7f..27730dd5 100644
--- a/doc-src/content/reference/compass/helpers.haml
+++ b/doc-src/content/reference/compass/helpers.haml
@@ -14,29 +14,29 @@ layout: core
:markdown
The compass helpers are functions that augment the [functions provided
- by Sass](http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html).
+ by Sass](http://sass-lang.com/yardoc/Sass/Script/Functions.html).
All Helpers:
- * [adjust-lightness()](/docs/reference/compass/helpers/colors/#adjust-lightness)
- * [adjust-saturation()](/docs/reference/compass/helpers/colors/#adjust-saturation)
- * [append-selector()](/docs/reference/compass/helpers/selectors/#append-selector)
- * [color-stops()](/docs/reference/compass/helpers/color-stops/)
- * [cos()](/docs/reference/compass/helpers/trig/#cos)
- * [elements-of-type()](/docs/reference/compass/helpers/display/)
- * [enumerate()](/docs/reference/compass/helpers/selectors/#enumerate)
- * [font-files()](/docs/reference/compass/helpers/font-files/)
- * [font-url()](/docs/reference/compass/helpers/urls/#stylesheet-url)
- * [headings()](/docs/reference/compass/helpers/selectors/#headings)
- * [image-width()](/docs/reference/compass/helpers/image-dimensions/#image-width)
- * [image-height()](/docs/reference/compass/helpers/image-dimensions/#image-height)
- * [image-url()](/docs/reference/compass/helpers/urls/#image-url)
- * [inline-font-files()](/docs/reference/compass/helpers/inline-data/#inline-font-files)
- * [inline-image()](/docs/reference/compass/helpers/inline-data/#inline-image)
- * [nest()](/docs/reference/compass/helpers/selectors/#nest)
- * [pi()](/docs/reference/compass/helpers/trig/#pi)
- * [sin()](/docs/reference/compass/helpers/trig/#sin)
- * [stylesheet-url()](/docs/reference/compass/helpers/urls/#stylesheet-url)
- * [scale-lightness()](/docs/reference/compass/helpers/colors/#scale-lightness)
- * [tan()](/docs/reference/compass/helpers/trig/#tan)
+ * [adjust-lightness()](/reference/compass/helpers/colors/#adjust-lightness)
+ * [adjust-saturation()](/reference/compass/helpers/colors/#adjust-saturation)
+ * [append-selector()](/reference/compass/helpers/selectors/#append-selector)
+ * [color-stops()](/reference/compass/helpers/color-stops/)
+ * [cos()](/reference/compass/helpers/trig/#cos)
+ * [elements-of-type()](/reference/compass/helpers/display/)
+ * [enumerate()](/reference/compass/helpers/selectors/#enumerate)
+ * [font-files()](/reference/compass/helpers/font-files/)
+ * [font-url()](/reference/compass/helpers/urls/#stylesheet-url)
+ * [headings()](/reference/compass/helpers/selectors/#headings)
+ * [image-width()](/reference/compass/helpers/image-dimensions/#image-width)
+ * [image-height()](/reference/compass/helpers/image-dimensions/#image-height)
+ * [image-url()](/reference/compass/helpers/urls/#image-url)
+ * [inline-font-files()](/reference/compass/helpers/inline-data/#inline-font-files)
+ * [inline-image()](/reference/compass/helpers/inline-data/#inline-image)
+ * [nest()](/reference/compass/helpers/selectors/#nest)
+ * [pi()](/reference/compass/helpers/trig/#pi)
+ * [sin()](/reference/compass/helpers/trig/#sin)
+ * [stylesheet-url()](/reference/compass/helpers/urls/#stylesheet-url)
+ * [scale-lightness()](/reference/compass/helpers/colors/#scale-lightness)
+ * [tan()](/reference/compass/helpers/trig/#tan)
diff --git a/doc-src/content/reference/compass/helpers/color-stops.haml b/doc-src/content/reference/compass/helpers/color-stops.haml
index c62a3643..01d3d5df 100644
--- a/doc-src/content/reference/compass/helpers/color-stops.haml
+++ b/doc-src/content/reference/compass/helpers/color-stops.haml
@@ -18,7 +18,7 @@ classnames:
.details
%p
The color-stops helper provides a way to pass an arbitrary number of
- colors stops to the gradient mixins.
+ colors stops to the gradient mixins.
%p
Any number of comma-delimited color stops can be passed, each color stop
should take the form of a color followed by an optional stopping point (separated by a space).
@@ -47,5 +47,5 @@ classnames:
%h4 Examples
%ul
%li
- %a(href="/docs/examples/compass/css3/gradient/") Example of Gradients
+ %a(href="/examples/compass/css3/gradient/") Example of Gradients
diff --git a/doc-src/content/reference/compass/helpers/colors.haml b/doc-src/content/reference/compass/helpers/colors.haml
index ddf0754d..0e99a04d 100644
--- a/doc-src/content/reference/compass/helpers/colors.haml
+++ b/doc-src/content/reference/compass/helpers/colors.haml
@@ -13,7 +13,7 @@ classnames:
%p
These color functions are useful for creating generic libraries that have to accept a
range of inputs. For more color functions see
- the sass reference
+ the sass reference
documentation
#adjust-lightness.helper
diff --git a/doc-src/content/reference/compass/helpers/display.haml b/doc-src/content/reference/compass/helpers/display.haml
index d242e8d0..d4f5396f 100644
--- a/doc-src/content/reference/compass/helpers/display.haml
+++ b/doc-src/content/reference/compass/helpers/display.haml
@@ -33,5 +33,5 @@ classnames:
%h4 Examples
%ul
%li
- %a(href="/docs/examples/compass/helpers/elements-of-type/") Example of elements-of-type
+ %a(href="/examples/compass/helpers/elements-of-type/") Example of elements-of-type
diff --git a/doc-src/content/reference/compass/helpers/font-files.haml b/doc-src/content/reference/compass/helpers/font-files.haml
index 5e61b39b..170c1bf5 100644
--- a/doc-src/content/reference/compass/helpers/font-files.haml
+++ b/doc-src/content/reference/compass/helpers/font-files.haml
@@ -22,7 +22,7 @@ classnames:
relative to your project's font directory and the second is the format of
that font.
%p
- This helper is used with the font-face mixin
+ This helper is used with the font-face mixin
and is what makes it possible to pass any number of font files.
%p
W3C Reference
@@ -30,6 +30,6 @@ classnames:
%h4 Examples
%ul
%li
- %a(href="/docs/examples/compass/css3/font-face/") Font-face Example
+ %a(href="/examples/compass/css3/font-face/") Font-face Example
diff --git a/doc-src/content/reference/compass/helpers/inline-data.haml b/doc-src/content/reference/compass/helpers/inline-data.haml
index bfb4c01d..eac0bf10 100644
--- a/doc-src/content/reference/compass/helpers/inline-data.haml
+++ b/doc-src/content/reference/compass/helpers/inline-data.haml
@@ -31,5 +31,5 @@ classnames:
inline-font-files([$font, $format]*)
.details
%p
- Like the font-files() helper, but the font
+ Like the font-files() helper, but the font
file is embedded within the generated CSS file.
\ No newline at end of file
diff --git a/doc-src/content/reference/compass/helpers/selectors.haml b/doc-src/content/reference/compass/helpers/selectors.haml
index e9820f61..472c79d4 100644
--- a/doc-src/content/reference/compass/helpers/selectors.haml
+++ b/doc-src/content/reference/compass/helpers/selectors.haml
@@ -63,9 +63,9 @@ classnames:
%h4 Examples
%ul
%li
- %a(href="/docs/examples/compass/helpers/enumerate/") Example of enumerate
+ %a(href="/examples/compass/helpers/enumerate/") Example of enumerate
%li
- %a(href="/docs/examples/compass/helpers/using-extend-in-place-of-enumerate/") Example of using @extend in place of enumerate
+ %a(href="/examples/compass/helpers/using-extend-in-place-of-enumerate/") Example of using @extend in place of enumerate
#headings.helper
%h3
diff --git a/doc-src/content/reference/compass/layout.haml b/doc-src/content/reference/compass/layout.haml
index 6b4f1b11..3d87ffcd 100644
--- a/doc-src/content/reference/compass/layout.haml
+++ b/doc-src/content/reference/compass/layout.haml
@@ -13,4 +13,4 @@ classnames:
- render 'reference' do
%p
This module provides tools to help you with page layout.
- So far, it's just the sticky-footer mixin.
+ So far, it's just the sticky-footer mixin.
diff --git a/doc-src/content/reference/compass/reset.haml b/doc-src/content/reference/compass/reset.haml
index af110e49..593bf669 100644
--- a/doc-src/content/reference/compass/reset.haml
+++ b/doc-src/content/reference/compass/reset.haml
@@ -12,10 +12,10 @@ meta_description: Adds a CSS Reset into your stylesheet.
---
- render 'reference' do
:markdown
- This module applies the [global reset](/docs/reference/compass/reset/utilities/#mixin-global-reset)
+ This module applies the [global reset](/reference/compass/reset/utilities/#mixin-global-reset)
to your stylesheet by simply importing it.
**Note:** This module will place styles into your stylesheet by importing it. This
is not the standard behavior of a compass module but it optimizes the common use case.
If you want to control the reset, please use the mixins defined in the [reset
- utilities module](/docs/reference/compass/reset/utilities/)
+ utilities module](/reference/compass/reset/utilities/)
diff --git a/doc-src/content/search.haml b/doc-src/content/search.haml
index a95cc410..49580019 100644
--- a/doc-src/content/search.haml
+++ b/doc-src/content/search.haml
@@ -4,8 +4,8 @@ crumb: Search
body_id: search
---
- content_for(:javascripts) do
- %script(type="text/javascript" src="/docs/javascripts/search-data.js")
- %script(type="text/javascript" src="/docs/javascripts/jquery.url.packed.js")
+ %script(type="text/javascript" src="/javascripts/search-data.js")
+ %script(type="text/javascript" src="/javascripts/jquery.url.packed.js")
:javascript
$(function(){
if ($.url.param("q")) {
diff --git a/doc-src/content/tutorials/best_practices.markdown b/doc-src/content/tutorials/best_practices.markdown
index fb93d4b4..53321e90 100644
--- a/doc-src/content/tutorials/best_practices.markdown
+++ b/doc-src/content/tutorials/best_practices.markdown
@@ -102,7 +102,7 @@ For instance, don't use `table thead tr th` when a simple `th` selector will
suffice. This might mean that you have to separate your styles into several
selectors and let the document cascade work to your advantage.
-[1]: http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials
+[1]: http://sass-lang.com/yardoc/file.SASS_REFERENCE.html#partials
[2]: http://groups.google.com/group/compass-users/browse_frm/thread/0ed216d409476f88
[3]: http://wiki.github.com/chriseppstein/compass/overriding-constants
[4]: http://c2.com/cgi/wiki?DontRepeatYourself
diff --git a/doc-src/content/tutorials/blueprint.haml b/doc-src/content/tutorials/blueprint.haml
index 839c91dd..c4fd0cc9 100644
--- a/doc-src/content/tutorials/blueprint.haml
+++ b/doc-src/content/tutorials/blueprint.haml
@@ -67,7 +67,7 @@ classnames:
%ul
%li
- %a(href="/docs/reference/blueprint/buttons/") Blueprint Buttons
+ %a(href="/reference/blueprint/buttons/") Blueprint Buttons
%li
- %a(href="/docs/reference/blueprint/link_icons/") Blueprint Link Icons
+ %a(href="/reference/blueprint/link_icons/") Blueprint Link Icons
diff --git a/doc-src/content/tutorials/command-line.markdown b/doc-src/content/tutorials/command-line.markdown
index f2d7fa42..433eefcd 100644
--- a/doc-src/content/tutorials/command-line.markdown
+++ b/doc-src/content/tutorials/command-line.markdown
@@ -11,7 +11,7 @@ This page lists the compass commands you can use to set up and manage your proje
You may also find one of these walk throughs useful:
-* HOWTO: [Compile your stylesheets for production](/docs/tutorials/production-css/)
+* HOWTO: [Compile your stylesheets for production](/tutorials/production-css/)
- %link{:charset => "utf-8", :href => "/docs/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}
- %link{:href => "/docs/stylesheets/syntax/shCore.css", :rel => "stylesheet", :type => "text/css"}
- %link{:href => "/docs/stylesheets/syntax/shThemeDefault.css", :rel => "stylesheet", :type => "text/css"}
+ %link{:charset => "utf-8", :href => "/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}
+ %link{:href => "/stylesheets/syntax/shCore.css", :rel => "stylesheet", :type => "text/css"}
+ %link{:href => "/stylesheets/syntax/shThemeDefault.css", :rel => "stylesheet", :type => "text/css"}
/[if gte IE 7]
- %link{:charset => "utf-8", :href => "/docs/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}
+ %link{:charset => "utf-8", :href => "/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}
/[if IE 6]
%link{:charset => "utf-8", :href => "http://universal-ie6-css.googlecode.com/files/ie6.0.3.css", :rel => "stylesheet", :type => "text/css"}
- if @item[:content_for_additional_css]
diff --git a/doc-src/layouts/default.haml b/doc-src/layouts/default.haml
index b11d9f14..818d0523 100644
--- a/doc-src/layouts/default.haml
+++ b/doc-src/layouts/default.haml
@@ -6,9 +6,9 @@
%meta{ :content => "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
- if @item[:meta_description]
%meta{:name => "description", :content => @item[:meta_description]}
- %link(rel="shortcut icon" type="image/png" href="/docs/images/compass_icon.png")
- %link{ :href => "/docs/stylesheets/legacy/main.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
- %script{:src => "/docs/javascripts/jquery-1.3.2.min.js", :type => "text/javascript"}
+ %link(rel="shortcut icon" type="image/png" href="/images/compass_icon.png")
+ %link{ :href => "/stylesheets/legacy/main.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
+ %script{:src => "/javascripts/jquery-1.3.2.min.js", :type => "text/javascript"}
%body{body_attributes(@item)}
#container
#main
@@ -16,5 +16,5 @@
#sidebar
= render "partials/sidebar", :default_stylesheet => "_compass.scss"
#footer= render "partials/footer"
- %script(src="/docs/javascripts/fixups.js" deferred)
+ %script(src="/javascripts/fixups.js" deferred)
= render "partials/analytics"
diff --git a/doc-src/layouts/homepage.haml b/doc-src/layouts/homepage.haml
index 07a2c2f9..c46caa63 100644
--- a/doc-src/layouts/homepage.haml
+++ b/doc-src/layouts/homepage.haml
@@ -6,10 +6,10 @@
%meta{ :content => "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
- if @item[:meta_description]
%meta{:name => "description", :content => @item[:meta_description]}
- %link(rel="shortcut icon" type="image/png" href="/docs/images/compass_icon.png")
- %link{ :href => "/docs/stylesheets/legacy/main.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
- %script{:src => "/docs/javascripts/jquery-1.3.2.min.js", :type => "text/javascript"}
+ %link(rel="shortcut icon" type="image/png" href="/images/compass_icon.png")
+ %link{ :href => "/stylesheets/legacy/main.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
+ %script{:src => "/javascripts/jquery-1.3.2.min.js", :type => "text/javascript"}
%body{body_attributes(@item)}
= yield
- %script(src="/docs/javascripts/fixups.js" deferred)
+ %script(src="/javascripts/fixups.js" deferred)
= render "partials/analytics"
diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml
index 3098a7e0..a3286161 100644
--- a/doc-src/layouts/main.haml
+++ b/doc-src/layouts/main.haml
@@ -6,32 +6,32 @@
%li.vcard
%a.fn.org.url.uid{:href => "/", :rel => "home"} Compass
%li
- %a{:href => "/docs/reference/compass/", :rel => "documentation"} Docs
+ %a{:href => "/reference/compass/", :rel => "documentation"} Docs
%li
%a{:href => "/help", :rel=> "help"} Get Help
%li
%a{:href => "/get-involved", :rel=> "get-involved"} Get Involved
- %form#search-docs{:action => "/docs/search/", :method => "GET"}
+ %form#search-docs{:action => "/search/", :method => "GET"}
%input#search{:name => "q", :type => "text", :value => "", :placeholder => "Search the docs"}
#sub-nav
%nav#docs-nav{:role => "navigation"}
- %a{:href => "/docs/reference/blueprint/", :rel => "blueprint"} Blueprint
- %a{:href => "/docs/reference/compass/", :rel => "core"} Core
+ %a{:href => "/reference/blueprint/", :rel => "blueprint"} Blueprint
+ %a{:href => "/reference/compass/", :rel => "core"} Core
- if @item[:content_for_module_nav]
%nav#module-nav= @item[:content_for_module_nav]
#page
#version
Version:
- %a.number(href="/docs/CHANGELOG/")= compass_version
+ %a.number(href="/CHANGELOG/")= compass_version
= yield
-#comments= render "partials/disqus_comments"
%footer(role="contentinfo")= render "partials/footer"
- %script(src="/docs/javascripts/jquery-1.3.2.min.js")
- %script(src="/docs/javascripts/fixups.js" deferred)
- %script{:src => "/docs/javascripts/shCore.js", :type => "text/javascript"}
- %script{:src => "/docs/javascripts/shBrushCss.js", :type => "text/javascript"}
- %script{:src => "/docs/javascripts/shBrushSass.js", :type => "text/javascript"}
- %script{:src => "/docs/javascripts/shBrushScss.js", :type => "text/javascript"}
+ %script(src="/javascripts/jquery-1.3.2.min.js")
+ %script(src="/javascripts/fixups.js" deferred)
+ %script{:src => "/javascripts/shCore.js", :type => "text/javascript"}
+ %script{:src => "/javascripts/shBrushCss.js", :type => "text/javascript"}
+ %script{:src => "/javascripts/shBrushSass.js", :type => "text/javascript"}
+ %script{:src => "/javascripts/shBrushScss.js", :type => "text/javascript"}
= @item[:content_for_javascripts]
= render "partials/analytics"
diff --git a/doc-src/layouts/partials/footer.haml b/doc-src/layouts/partials/footer.haml
index 6eb569f6..ef5ce1b3 100644
--- a/doc-src/layouts/partials/footer.haml
+++ b/doc-src/layouts/partials/footer.haml
@@ -1,7 +1,7 @@
.legalese
%p
:plain
-
%br
diff --git a/doc-src/layouts/partials/reference/constants.haml b/doc-src/layouts/partials/reference/constants.haml
index fbd8acbd..80360db0 100644
--- a/doc-src/layouts/partials/reference/constants.haml
+++ b/doc-src/layouts/partials/reference/constants.haml
@@ -4,7 +4,7 @@
- if variables.any?
%h2
Configurable Variables
- %a(href="/docs/tutorials/configurable-variables/" class="help") help
+ %a(href="/tutorials/configurable-variables/" class="help") help
= render "partials/reference/const_table", :constants => variables
- if constants.any?