diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-08-03 11:23:30 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-08-03 11:24:55 +0200 |
| commit | 1921c6e91a4d75e321cb738042b95e7adab0f929 (patch) | |
| tree | a557a0369d3c48c46e2546943fff131c543acbf4 /railties/lib | |
| parent | 465f0fbca3d4a1c269038b84ec9cc248fdab5fab (diff) | |
| parent | cbf178664d3a3ecd55ad127d2a92f120b244b950 (diff) | |
| download | rails-1921c6e91a4d75e321cb738042b95e7adab0f929.tar.gz rails-1921c6e91a4d75e321cb738042b95e7adab0f929.tar.bz2 rails-1921c6e91a4d75e321cb738042b95e7adab0f929.zip | |
Merge pull request #21104 from atul-shimpi/master
Inform user to add styles in correct location in application.css
[ci skip]
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css | 3 |
2 files changed, 4 insertions, 2 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 0cdd2788d0..0ebd7fe829 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 @@ -7,7 +7,8 @@ * * 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 other CSS/SCSS - * files in this directory. It is generally better to create a new file per style scope. + * files in this directory. Styles in this file should be added after the last require_* statement. + * 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 0cdd2788d0..0ebd7fe829 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css @@ -7,7 +7,8 @@ * * 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 other CSS/SCSS - * files in this directory. It is generally better to create a new file per style scope. + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. * *= require_tree . *= require_self |