Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #11640 from pawel2105/manifest_fix

Changed stylesheet load order in the stylesheet manifest generator.
  • Loading branch information...
commit 516606b8194f74a148e61bf7eb9693e6500aaa9c 2 parents 96a80bf + f18aecf
David Heinemeier Hansson dhh authored
4 railties/CHANGELOG.md
View
@@ -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.
8 railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
View
@@ -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
*/
8 railties/lib/rails/generators/rails/plugin/templates/rails/stylesheets.css
View
@@ -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
*/
Please sign in to comment.
Something went wrong with that request. Please try again.