From 90128828b14a18d6a1d372a76faf7cc8f163e06e Mon Sep 17 00:00:00 2001 From: Nick Kugaevsky Date: Sun, 10 Mar 2013 07:09:25 +0400 Subject: [PATCH] Minor templates update: fix indents and require custom.modernizr in haml and slim template --- .../generators/templates/application.html.erb | 77 ++++++++++--------- .../templates/application.html.haml | 7 +- .../templates/application.html.slim | 11 +-- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/lib/foundation/generators/templates/application.html.erb b/lib/foundation/generators/templates/application.html.erb index 665821686..2223b4cae 100644 --- a/lib/foundation/generators/templates/application.html.erb +++ b/lib/foundation/generators/templates/application.html.erb @@ -4,40 +4,43 @@ - - - - - - - - - - <%%= content_for?(:title) ? yield(:title) : "Untitled" %> - - <%%= stylesheet_link_tag "application" %> - <%%= javascript_include_tag "vendor/custom.modernizr" %> - <%%= csrf_meta_tags %> - - - <%%= yield %> - <% if false %> - - - - <% end %> - <%%= javascript_include_tag "application" %> - - \ No newline at end of file + + + + + + + + + + <%%= content_for?(:title) ? yield(:title) : "Untitled" %> + + <%%= stylesheet_link_tag "application" %> + <%%= javascript_include_tag "vendor/custom.modernizr" %> + <%%= csrf_meta_tags %> + + + + + <%%= yield %> + + <% if false %> + + + + <% end %> + <%%= javascript_include_tag "application" %> + + diff --git a/lib/foundation/generators/templates/application.html.haml b/lib/foundation/generators/templates/application.html.haml index 85474a821..ba700aab7 100644 --- a/lib/foundation/generators/templates/application.html.haml +++ b/lib/foundation/generators/templates/application.html.haml @@ -11,15 +11,18 @@ -# Uncomment to make IE8 render like IE7 -# meta http-equiv="X-UA-Compatible" content="IE=7" - + -# Set the viewport width to device width for mobile %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" } %title= content_for?(:title) ? yield(:title) : "Untitled" = stylesheet_link_tag "application" + = javascript_include_tag "vendor/custom.modernizr" = csrf_meta_tag %body + = yield - = javascript_include_tag "application" \ No newline at end of file + + = javascript_include_tag "application" diff --git a/lib/foundation/generators/templates/application.html.slim b/lib/foundation/generators/templates/application.html.slim index 32aaa7593..09f048855 100644 --- a/lib/foundation/generators/templates/application.html.slim +++ b/lib/foundation/generators/templates/application.html.slim @@ -11,17 +11,18 @@ head / Uncomment to make IE8 render like IE7 / meta http-equiv="X-UA-Compatible" content="IE=7" - + / Set the viewport width to device width for mobile meta name="viewport" content="width=device-width, initial-scale=1.0" title= content_for?(:title) ? yield(:title) : "Untitled" = stylesheet_link_tag "application" - + = javascript_include_tag "vendor/custom.modernizr" = csrf_meta_tag body - .container - == yield - = javascript_include_tag "application" \ No newline at end of file + + == yield + + = javascript_include_tag "application" -- 2.47.3