diff options
| author | Pawel Janiak <brand.magnate@gmail.com> | 2013-07-28 15:05:17 +0200 |
|---|---|---|
| committer | Pawel Janiak <brand.magnate@gmail.com> | 2013-07-28 15:05:17 +0200 |
| commit | f18aecfe7b70849f2f73da329a6a14260cea6edd (patch) | |
| tree | 673d8ebc0d84e689fd181513db6a14454105bc9f /railties/lib | |
| parent | b6c0639825a2ed723a00c32acec87bfeffc1b9ed (diff) | |
| download | rails-f18aecfe7b70849f2f73da329a6a14260cea6edd.tar.gz rails-f18aecfe7b70849f2f73da329a6a14260cea6edd.tar.bz2 rails-f18aecfe7b70849f2f73da329a6a14260cea6edd.zip | |
Changed stylesheet load order in the stylesheet manifest generator.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css | 8 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css | 8 |
2 files changed, 10 insertions, 6 deletions
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 */ |