aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-29 14:43:26 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-29 14:43:26 -0800
commitbd0173574ca908acca3f29b9da7db03bd6a89436 (patch)
tree2e712249472f7cd4a1de802352f0e4aabf648e66 /guides
parent6277bd80c904290ca97c5c0380678cd981992d99 (diff)
parentaba9fc084759d391217c2b7491505e75941b8f00 (diff)
downloadrails-bd0173574ca908acca3f29b9da7db03bd6a89436.tar.gz
rails-bd0173574ca908acca3f29b9da7db03bd6a89436.tar.bz2
rails-bd0173574ca908acca3f29b9da7db03bd6a89436.zip
Merge pull request #13876 from sowjumn/master
Added some style changes in asset pipeline documentation
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md15
1 files changed, 5 insertions, 10 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 40e0770177..0422dda0d8 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -496,16 +496,11 @@ In this example, `require_self` is used. This puts the CSS contained within the
file (if any) at the precise location of the `require_self` call. If
`require_self` is called more than once, only the last call is respected.
-NOTE. If you want to use multiple Sass files, you should generally use the [Sass
-`@import`
-rule](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import) instead
-of these Sprockets directives. Using Sprockets directives all Sass files exist
-within their own scope, making variables or mixins only available within the
-document they were defined in. You can do file globbing as well using
-`@import "*"`, and `@import "**/*"` to add the whole tree equivalent to how
-`require_tree` works. Check the [sass-rails
-documentation](https://github.com/rails/sass-rails#features) for more info and
-important caveats.
+NOTE. If you want to use multiple Sass files, you should generally use the [Sass `@import` rule](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import)
+instead of these Sprockets directives. Using Sprockets directives all Sass files exist within
+their own scope, making variables or mixins only available within the document they were defined in.
+You can do file globbing as well using `@import "*"`, and `@import "**/*"` to add the whole tree
+equivalent to how `require_tree` works. Check the [sass-rails documentation](https://github.com/rails/sass-rails#features) for more info and important caveats.
You can have as many manifest files as you need. For example, the `admin.css`
and `admin.js` manifest could contain the JS and CSS files that are used for the