diff options
| author | Zachary Scott <e@zzak.io> | 2015-01-22 09:21:55 -0800 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2015-01-22 09:21:55 -0800 |
| commit | 2ced07de4f25783f386df496ad610e2f75f5f23c (patch) | |
| tree | 174ff92c76952b80af1eb1c255577576d3482eaf /railties/lib | |
| parent | 3d4eaf6dad8186b531d99c4593c8ba626c9ca8cd (diff) | |
| parent | 285224e2aebc55cee88c72ec4a0ae55d36c8ef81 (diff) | |
| download | rails-2ced07de4f25783f386df496ad610e2f75f5f23c.tar.gz rails-2ced07de4f25783f386df496ad610e2f75f5f23c.tar.bz2 rails-2ced07de4f25783f386df496ad610e2f75f5f23c.zip | |
Merge pull request #18644 from rwarbelow/fix-wording-of-css-manifest
fix wording of CSS manifest instructions [ci skip]
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css | 5 |
2 files changed, 4 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 f9cd5b3483..0cdd2788d0 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 @@ -6,9 +6,8 @@ * or any plugin's vendor/assets/stylesheets directory 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 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. + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. It is generally better to create a new file per style scope. * *= 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 f9cd5b3483..0cdd2788d0 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css @@ -6,9 +6,8 @@ * or any plugin's vendor/assets/stylesheets directory 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 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. + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. It is generally better to create a new file per style scope. * *= require_tree . *= require_self |