]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cdff7f3)
Minor templates update: fix indents and require custom.modernizr in haml and slim... 1816/head
authorNick Kugaevsky <nick@kugaevsky.ru>
Sun, 10 Mar 2013 03:09:25 +0000 (07:09 +0400)
committerNick Kugaevsky <nick@kugaevsky.ru>
Sun, 10 Mar 2013 03:09:25 +0000 (07:09 +0400)
lib/foundation/generators/templates/application.html.erb patch | blob | blame | history
lib/foundation/generators/templates/application.html.haml patch | blob | blame | history
lib/foundation/generators/templates/application.html.slim patch | blob | blame | history

diff --git a/lib/foundation/generators/templates/application.html.erb b/lib/foundation/generators/templates/application.html.erb
index 6658216865821c6f0ee1e67cff246a6458a6d750..2223b4cae099a2b123effdc1e2f99f535df3aae5 100644 (file)
--- a/lib/foundation/generators/templates/application.html.erb
+++ b/lib/foundation/generators/templates/application.html.erb
@@ -4,40 +4,43 @@
 <!--[if IE 7 ]>    <html class="ie7" lang="en"> <![endif]-->
 <!--[if IE 8 ]>    <html class="ie8" lang="en"> <![endif]-->
 <!--[if (gte IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
-<head>
-       <meta charset="utf-8" />
-       
-       <!-- 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" %></title>
-
-       <%%= stylesheet_link_tag    "application" %>
-       <%%= javascript_include_tag "vendor/custom.modernizr" %>
-  <%%= csrf_meta_tags %>
-</head>
-<body>
-  <%%= yield %>
-  <% if false %>
-       <script>
-       document.write('<script src=' +
-       ('__proto__' in {} ? '<%%= asset_path("vendor/zepto") %>' : '<%%= asset_path("jquery") %>') +
-       '><\/script>');
-  </script>
-
-  <script>
-  // Ensure rails_ujs works with Zepto
-       $.fn.ajaxSend = function(callback) {
-         return this.each(function(){
-           $(this).on('ajaxBeforeSend', callback);
-         });
-       };
-       var jQuery = $;
-       </script>
-       <% end %>
-  <%%= javascript_include_tag "application" %>
-</body>
-</html>
\ No newline at end of file
+  <head>
+       <meta charset="utf-8" />
+
+       <!-- 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" %></title>
+
+       <%%= stylesheet_link_tag    "application" %>
+       <%%= javascript_include_tag "vendor/custom.modernizr" %>
+    <%%= csrf_meta_tags %>
+  </head>
+
+  <body>
+
+    <%%= yield %>
+
+    <% if false %>
+       <script>
+       document.write('<script src=' +
+       ('__proto__' in {} ? '<%%= asset_path("vendor/zepto") %>' : '<%%= asset_path("jquery") %>') +
+       '><\/script>');
+      </script>
+
+      <script>
+        // Ensure rails_ujs works with Zepto
+       $.fn.ajaxSend = function(callback) {
+         return this.each(function(){
+           $(this).on('ajaxBeforeSend', callback);
+         });
+       };
+       var jQuery = $;
+       </script>
+       <% end %>
+    <%%= javascript_include_tag "application" %>
+  </body>
+</html>
diff --git a/lib/foundation/generators/templates/application.html.haml b/lib/foundation/generators/templates/application.html.haml
index 85474a821fcc58d347fad66a10a6d664a3942faa..ba700aab7e95321fe0971ba57ff936198856ef1f 100644 (file)
--- 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 32aaa7593052c79673594a96f22f1ac0ead89916..09f04885529312e79f383f0e026e3a55ddebc75b 100644 (file)
--- 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"
Mirror of https://github.com/foundation/foundation-sites.git