Skip to content
Browse files

making changes to the index.haml after testing the gem

  • Loading branch information...
1 parent fd7bbae commit 1bdf4da66622ae0084ebf00a27f27a9d9ab6eef0 @heygrady committed Nov 19, 2011
Showing with 22 additions and 12 deletions.
  1. +8 −0 README.md
  2. +1 −1 html5-boilerplate.gemspec
  3. +6 −5 templates/project/_javascripts.html.haml
  4. +7 −6 templates/project/index.html.haml
View
8 README.md
@@ -74,6 +74,10 @@ Start your Rails server, and you're done!
public/robots.txt
public/humans.txt
public/apple-touch-icon.png
+ public/apple-touch-icon-57x57-precomposed.png
+ public/apple-touch-icon-72x72-precomposed.png
+ public/apple-touch-icon-114x114-precomposed.png
+ public/apple-touch-icon-precomposed.png
public/favicon.ico
public/javascripts/jquery.min.js
@@ -127,6 +131,10 @@ If you omit them, be sure to edit your javascript and style tags accordingly in
robots.txt
humans.txt
apple-touch-icon.png
+ apple-touch-icon-57x57-precomposed.png
+ apple-touch-icon-72x72-precomposed.png
+ apple-touch-icon-114x114-precomposed.png
+ apple-touch-icon-precomposed.png
favicon.ico
src/style.scss
View
2 html5-boilerplate.gemspec
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
s.date = "2011-11-19"
s.name = "html5-boilerplate"
- s.authors = ["Peter Gumeson"]
+ s.authors = ["Peter Gumeson", "Grady Kuhnline"]
s.summary = %q{A Compass extension based on Paul Irish's HTML5 Boilerplate}
s.description = %q{A Compass extension based on Paul Irish's HTML5 Boilerplate at http://html5boilerplate.com}
s.email = "gumeson@gmail.com"
View
11 templates/project/_javascripts.html.haml
@@ -3,13 +3,13 @@
-# remote_jquery and local_jquery helpers use minified jquery unless Rails.env is development
- if !google_api_key.blank?
= javascript_include_tag "//www.google.com/jsapi?key=#{google_api_key}"
- :javascript
+ %script
google.load(#{ remote_jquery("1.6.2") });
- else
= javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/#{ local_jquery("1.6.2") }"
-# fall back to local jQuery if necessary
-:javascript
+%script
window.jQuery || document.write("<script src='/javascripts/jquery.min.js'>\x3C/script>")
= javascript_include_tag 'rails', 'plugins', 'application'
@@ -20,7 +20,7 @@
-# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
-# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/google.yml
- if !google_account_id.blank?
- :javascript
+ %script
var _gaq=[["_setAccount","#{google_account_id}"],["_trackPageview"],["_trackPageLoadTime"]];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
@@ -31,6 +31,7 @@
chromium.org/developers/how-tos/chrome-frame-getting-started
<!--[if lt IE 7]>
- <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
- <script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
+%script{ :src => "//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js" }
+%script
+ window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
<![endif]-->
View
13 templates/project/index.html.haml
@@ -44,9 +44,9 @@
-# Javascript at the bottom for fast page loading
-# Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline
- %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.js" }
- :javascript
- window.jQuery || document.write("<script src='js/jquery.min.js'>\x3C/script>")
+ %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" }
+ %script
+ window.jQuery || document.write("<script src='js/jquery-1.6.2.min.js'>\x3C/script>")
-# scripts concatenated and minified via ant build script
%script{ :src => "js/plugins.js" }
@@ -55,7 +55,7 @@
-# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
-# change the UA-XXXXX-X to be your site's ID
- :javascript
+ %script
var _gaq=[["_setAccount","UA-XXXXX-X"],["_trackPageview"],["_trackPageLoadTime"]];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
@@ -66,6 +66,7 @@
chromium.org/developers/how-tos/chrome-frame-getting-started
<!--[if lt IE 7]>
- <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
- <script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
+ %script{ :src => "//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js" }
+ %script
+ window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})});
<![endif]-->

0 comments on commit 1bdf4da

Please sign in to comment.
Something went wrong with that request. Please try again.