diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2013-07-28 11:00:07 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2013-07-28 11:00:07 -0700 |
| commit | 516606b8194f74a148e61bf7eb9693e6500aaa9c (patch) | |
| tree | 670e490b1c7f1dda8d22c9d96a37fbcea34d556d /railties | |
| parent | 96a80bf3943c2e5908a56d098d65007ae56b5ee3 (diff) | |
| parent | f18aecfe7b70849f2f73da329a6a14260cea6edd (diff) | |
| download | rails-516606b8194f74a148e61bf7eb9693e6500aaa9c.tar.gz rails-516606b8194f74a148e61bf7eb9693e6500aaa9c.tar.bz2 rails-516606b8194f74a148e61bf7eb9693e6500aaa9c.zip | |
Merge pull request #11640 from pawel2105/manifest_fix
Changed stylesheet load order in the stylesheet manifest generator.
Diffstat (limited to 'railties')
3 files changed, 14 insertions, 6 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 7e7b157483..dd357bfbc5 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -68,4 +68,8 @@ *Sıtkı Bağdat* +* Changed stylesheet load order in the stylesheet manifest generator. [Fixes #11639] + + *Pawel Janiak* + Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes. diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css index 3192ec897b..a443db3401 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css @@ -5,9 +5,11 @@ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. * - *= require_self *= require_tree . + *= require_self */ diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css b/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css index 3192ec897b..a443db3401 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css @@ -5,9 +5,11 @@ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. * - *= require_self *= require_tree . + *= require_self */ |