diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-10-29 14:08:24 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-10-29 14:08:24 -0200 |
| commit | 7b2d2a6a0ef9d078062fcd423e1c3749ab20ceb7 (patch) | |
| tree | 7051b060e175209eff97c8deb6333dc583288379 /railties/lib/rails | |
| parent | 35085c9540b5f5b1423627b2e7a497adbc28e0b2 (diff) | |
| parent | 4570e10f8de6a40e0ef19476d123e786ddf03a7a (diff) | |
| download | rails-7b2d2a6a0ef9d078062fcd423e1c3749ab20ceb7.tar.gz rails-7b2d2a6a0ef9d078062fcd423e1c3749ab20ceb7.tar.bz2 rails-7b2d2a6a0ef9d078062fcd423e1c3749ab20ceb7.zip | |
Merge pull request #22118 from cllns/fix-spacing-in-layout-template
Properly indent '<head>' and '<body>' within '<html>'
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt | 33 |
1 files changed, 17 insertions, 16 deletions
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 75ea52828e..8bb4440f55 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 @@ -1,23 +1,24 @@ <!DOCTYPE html> <html> -<head> - <title><%= camelized %></title> - <%- if options[:skip_javascript] -%> - <%%= stylesheet_link_tag 'application', media: 'all' %> - <%- else -%> - <%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%> - <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <head> + <title><%= camelized %></title> + <%- if options[:skip_javascript] -%> + <%%= stylesheet_link_tag 'application', media: 'all' %> <%- else -%> - <%%= stylesheet_link_tag 'application', media: 'all' %> - <%%= javascript_include_tag 'application' %> + <%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%> + <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%- else -%> + <%%= stylesheet_link_tag 'application', media: 'all' %> + <%%= javascript_include_tag 'application' %> + <%- end -%> <%- end -%> - <%- end -%> - <%%= csrf_meta_tags %> -</head> -<body> + <%%= csrf_meta_tags %> + </head> -<%%= yield %> + <body> -</body> + <%%= yield %> + + </body> </html> |