diff options
| author | Yehuda Katz <wycats@gmail.com> | 2011-11-22 12:38:05 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2011-11-22 12:38:05 -0800 |
| commit | 9b7be78820c5510b2f841dc2197ed3a32ad8dd19 (patch) | |
| tree | 70060d489384f30b5d7c38dd1bc71a1b2bc895ab /railties | |
| parent | b13b49ccc17a04836fdc877094eab4c951e69e66 (diff) | |
| parent | 05e02deb686fc21f99c2d1dcf3abc987796e0e19 (diff) | |
| download | rails-9b7be78820c5510b2f841dc2197ed3a32ad8dd19.tar.gz rails-9b7be78820c5510b2f841dc2197ed3a32ad8dd19.tar.bz2 rails-9b7be78820c5510b2f841dc2197ed3a32ad8dd19.zip | |
Merge pull request #3724 from marcandre/media_default
stylesheet_tag default's media is "screen"
Diffstat (limited to 'railties')
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/code/getting_started/app/views/layouts/application.html.erb b/railties/guides/code/getting_started/app/views/layouts/application.html.erb index 1e1e4b9a99..7fd6b4f516 100644 --- a/railties/guides/code/getting_started/app/views/layouts/application.html.erb +++ b/railties/guides/code/getting_started/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ <html> <head> <title>Blog</title> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> </head> diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt index c63d1b6ac5..bba96a7431 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt @@ -2,7 +2,7 @@ <html> <head> <title><%= camelized %></title> - <%%= stylesheet_link_tag "application" %> + <%%= stylesheet_link_tag "application", :media => "all" %> <%%= javascript_include_tag "application" %> <%%= csrf_meta_tags %> </head> diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt index 01550dec2f..bd983fb90f 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt +++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt @@ -2,7 +2,7 @@ <html> <head> <title><%= camelized %></title> - <%%= stylesheet_link_tag "<%= name %>/application" %> + <%%= stylesheet_link_tag "<%= name %>/application", :media => "all" %> <%%= javascript_include_tag "<%= name %>/application" %> <%%= csrf_meta_tags %> </head> |