html5-boilerplate 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/app/helpers/html5_boilerplate_helper.rb

@@ -3,11 +3,10 @@ module Html5BoilerplateHelper
   # http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
   def ie_tag(name=:body, attrs={}, &block)
     attrs.symbolize_keys!
-    haml_concat("<!--[if lt IE 7 ]> #{ tag(name, add_class('ie6', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if IE 7 ]>    #{ tag(name, add_class('ie7', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if IE 8 ]>    #{ tag(name, add_class('ie8', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if IE 9 ]>    #{ tag(name, add_class('ie9', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if (gte IE 9)|!(IE)]><!-->".html_safe)
+    haml_concat("<!--[if lt IE 7]> #{ tag(name, add_class('ie6', attrs), true) } <![endif]-->".html_safe)
+    haml_concat("<!--[if IE 7]>    #{ tag(name, add_class('ie7', attrs), true) } <![endif]-->".html_safe)
+    haml_concat("<!--[if IE 8]>    #{ tag(name, add_class('ie8', attrs), true) } <![endif]-->".html_safe)
+    haml_concat("<!--[if gt IE 8]><!-->".html_safe)
     haml_tag name, attrs do
       haml_concat("<!--<![endif]-->".html_safe)
       block.call

data/stylesheets/html5-boilerplate/_fonts.scss

@@ -3,7 +3,7 @@ $base-font-size: 13px !default;
 $base-line-height: 1.231 !default;
 
 //
-// Font normalization inspired by YUI Library's fonts.css: developer.yahoo.com/yui
+// Font normalization inspired by YUI Library's fonts.css: developer.yahoo.com/yui/
 // Whatever parts of this port of YUI to Sass that are copyrightable, are Copyright (c) 2008, Christopher Eppstein. All Rights Reserved.
 //
 
@@ -17,15 +17,13 @@ $base-line-height: 1.231 !default;
 
   select, input, textarea, button { font: 99% $family; }
 
-  // normalize monospace sizing 
-  // meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/
+  // Normalize monospace sizing:
   // en.wikipedia.org/wiki/MediaWiki_talk:Common.css/Archive_11#Teletype_style_fix_for_Chrome
   pre, code, kbd, samp { font-family: monospace, sans-serif; }
 }
 
-// maxvoltar.com/archive/-webkit-font-smoothing
 @mixin font-smoothing {
-  -webkit-font-smoothing: antialiased;
+  @warn "The 'font-smoothing' mixin has been deprecated as it made monospace too thin.";
 }
 
 // Sets the font size specified in pixels using percents so that the base

data/stylesheets/html5-boilerplate/_media.scss

@@ -22,7 +22,7 @@
 
 @mixin media-print {
   * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
-  -ms-filter: none !important; } // black prints faster: sanbeiji.com/archives/953
+  -ms-filter: none !important; } // Black prints faster: sanbeiji.com/archives/953
   a, a:visited { color: #444 !important; text-decoration: underline; }
   a[href]:after { content: " (" attr(href) ")"; }
   abbr[title]:after { content: " (" attr(title) ")"; }

data/stylesheets/html5-boilerplate/_reset.scss

@@ -12,23 +12,23 @@
   article, aside, canvas, details, figcaption, figure,
   footer, header, hgroup, menu, nav, section, summary,
   time, mark, audio, video {
-    margin:0;
-    padding:0;
-    border:0;
-    font-size:100%;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
     font: inherit;
-    vertical-align:baseline;
+    vertical-align: baseline;
   }
 
   article, aside, details, figcaption, figure,
-  footer, header, hgroup, menu, nav, section { 
+  footer, header, hgroup, menu, nav, section {
     display: block;
   }
 
   blockquote, q { quotes: none; }
 
   blockquote:before, blockquote:after,
-  q:before, q:after { content:''; content:none; }
+  q:before, q:after { content: ""; content: none; }
 
   ins { background-color: #ff9; color: #000; text-decoration: none; }
 

data/stylesheets/html5-boilerplate/_styles.scss

@@ -17,7 +17,7 @@ $list-left-margin: 1.8em !default;
   ul, ol { margin-left: $list-left-margin; }
   ol { list-style-type: decimal; }
 
-  td, td img { vertical-align: top; }
+  td { vertical-align: top; }
 
   sub { @include sub; }
 
@@ -33,7 +33,7 @@ $list-left-margin: 1.8em !default;
 
   @include hand-cursor-inputs;
 
-  @include webkit-reset-form-elements;
+  @include reset-form-elements;
 
   @include selected-text;
 
@@ -60,13 +60,12 @@ $list-left-margin: 1.8em !default;
 // www.pathf.com/blogs/2008/05/formatting-quoted-code-in-blog-posts-css21-white-space-pre-wrap
 @mixin quoted-pre {
   pre {
-    white-space: pre; white-space: pre-wrap; white-space: pre-line; word-wrap: break-word;
+    white-space: pre; white-space: pre-wrap; word-wrap: break-word;
     padding: 15px;
   }
 }
 
-// Align checkboxes, radios, text inputs with their label
-// by: Thierry Koblentz tjkdesign.com/ez-css/css/base.css
+// Align checkboxes, radios, text inputs with their label by: Thierry Koblentz tjkdesign.com/ez-css/css/base.css
 @mixin align-input-labels {
   input[type="radio"] { vertical-align: text-bottom; }
   input[type="checkbox"] { vertical-align: bottom; }
@@ -79,9 +78,19 @@ $list-left-margin: 1.8em !default;
   label, input[type="button"], input[type="submit"], input[type="image"], button { cursor: pointer; }
 }
 
-// Webkit browsers add a 2px margin outside the chrome of form elements
+@mixin reset-form-elements {
+  // 1) Make inputs and buttons play nice in IE: www.viget.com/inspire/styling-the-button-element-in-internet-explorer/
+  // 2) WebKit browsers add a 2px margin outside the chrome of form elements.
+  //    Firefox adds a 1px margin above and below textareas
+  button, input, select, textarea { width: auto; overflow: visible; margin: 0; }
+  
+  // Remove extra padding and inner border in Firefox
+  input::-moz-focus-inner,
+  button::-moz-focus-inner { border: 0; padding: 0; }
+}
+
 @mixin webkit-reset-form-elements {
-  button, input, select, textarea { margin: 0; }
+  @warn "The 'webkit-reset-form-elements' mixin has been deprecated. Use 'reset-form-elements' instead.";
 }
 
 // These selection declarations have to be separate.
@@ -103,10 +112,6 @@ $list-left-margin: 1.8em !default;
 }
 
 @mixin ie-hacks {
-  // Make buttons play nice in IE:    
-  // www.viget.com/inspire/styling-the-button-element-in-internet-explorer/
-  button {  width: auto; overflow: visible; }
-
   // Bicubic resizing for non-native sized IMG: 
   // code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
   .ie7 img { -ms-interpolation-mode: bicubic; }
@@ -117,4 +122,4 @@ $list-left-margin: 1.8em !default;
 @mixin no-nav-margins {
   // remove margins for navigation lists
   nav ul, nav li { margin: 0; list-style:none; list-style-image: none; }
-}
+}

data/templates/project/_head.html.haml

@@ -1,27 +1,27 @@
-%head
-  %meta{ :charset => "utf-8" }/
+%meta{ :charset => "utf-8" }/
+
+-# Always force latest IE rendering engine (even in intranet) & Chrome Frame
+-# Remove this if you use the .htaccess
+%meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" }/
+
+%title
+  == #{ controller.controller_name.titleize } - #{ controller.action_name.titleize }
   
-  -#
-    Always force latest IE rendering engine (even in intranet) & Chrome Frame
-    Remove this if you use the .htaccess
-  %meta{ :content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible" }/
-  
-  %title
-    == #{ controller.controller_name.titleize } - #{ controller.action_name.titleize }
-    
-  %meta{ :content => "", :name => "description" }/
-  %meta{ :content => "", :name => "author" }/
-  
-  -# Mobile viewport optimized: j.mp/bplateviewport
-  %meta{ :content => "width=device-width, initial-scale=1.0", :name => "viewport" }/
-  
-  -# Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references
-  -# %link{ :href => "/favicon.ico", :rel => "shortcut icon" }/
-  -# %link{ :href => "/apple-touch-icon.png", :rel => "apple-touch-icon" }/
-  
-  = render :partial => 'layouts/stylesheets'
-  
-  -# All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects
-  = javascript_include_tag 'modernizr.min'
-  
-  = csrf_meta_tag
+%meta{ :name => "description", :content => "" }/
+%meta{ :name => "author", :content => "" }/
+
+-# Mobile viewport optimized: j.mp/bplateviewport
+%meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }/
+
+-# Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references
+-# %link{ :rel => "shortcut icon", :href => "/favicon.ico" }/
+-# %link{ :rel => "apple-touch-icon", :href => "/apple-touch-icon.png" }/
+
+-# You can specify a stylesheet_partial when rendering this partial (i.e. admin/stylesheets)
+- if local_assigns[:stylesheet_partial]
+  = render :partial => local_assigns[:stylesheet_partial]
+
+-# All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects
+= javascript_include_tag 'modernizr.min'
+
+= csrf_meta_tag

data/templates/project/_javascripts.html.haml

@@ -4,13 +4,13 @@
 - if !google_api_key.blank?
   = javascript_include_tag "//www.google.com/jsapi?key=#{google_api_key}"
   :javascript
-    google.load(#{ remote_jquery("1.5.1") });
+    google.load(#{ remote_jquery("1.5.2") });
 - else
-  = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/#{ local_jquery("1.5.1") }"
+  = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/#{ local_jquery("1.5.2") }"
 
 -# fall back to local jQuery if necessary
 :javascript
-  !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/jquery.min.js"%3E%3C/script%3E'))
+  window.jQuery || document.write("<script src='/javascripts/jquery.min.js'>\x3C/script>")
   
 = javascript_include_tag 'rails', 'plugins', 'application'
 
@@ -27,11 +27,7 @@
 -# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/google.yml
 - if !google_account_id.blank?
   :javascript
-    var _gaq = [['_setAccount', '#{google_account_id}'], ['_trackPageview']];
-    (function(d, t) {
-      var g = d.createElement(t),
-          s = d.getElementsByTagName(t)[0];
-      g.async = true;
-      g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      s.parentNode.insertBefore(g, s);
-    })(document, 'script');
+    var _gaq=[["_setAccount","#{google_account_id}"],["_trackPageview"]];
+    (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";
+    s.parentNode.insertBefore(g,s)}(document,"script"));

data/templates/project/application.html.haml

@@ -1,15 +1,20 @@
 !!! 5
 -# http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
--ie_html :class => 'no-js' do
-  = render :partial => 'layouts/head'
-  %body{ :lang => 'en', :class => "#{controller.controller_name}" }
+-ie_html :class => 'no-js', :lang => 'en' do
+  %head
+    = render "layouts/head", :stylesheet_partial => "layouts/stylesheets"
+  
+  %body{ :class => "#{controller.controller_name}" }
     #container
       %header#header
-        = render :partial => 'layouts/header'
+        = render "layouts/header"
+        
       #main{ :role => 'main' }
-        = render :partial => 'layouts/flashes'
+        = render "layouts/flashes"
         = yield
+        
       %footer#footer
-        = render :partial => 'layouts/footer'
+        = render "layouts/footer"
+        
     -# Javascript at the bottom for fast page loading
-    = render :partial => 'layouts/javascripts'
+    = render "layouts/javascripts"

data/templates/project/files/404.html

@@ -1,22 +1,38 @@
 <!doctype html>
-<title>not found</title>
-
-<style>
-body { text-align: center;}
-h1 { font-size: 50px; }
-body { font: 20px Constantia, 'Hoefler Text',  "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
-::-moz-selection{ background:#FF5E99; color:#fff; }
-::selection { background:#FF5E99; color:#fff; } 
-details { display:block; }
-a { color: rgb(36, 109, 56); text-decoration:none; }
-a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
-span[frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
-</style>
-
-
-
-
-<details>
-  <summary><h1>Not found</h1></summary>
-  <p><span frown>:(</span></p>
-</details>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Page Not Found :(</title> 
+  <style>
+	  body { text-align: center;}
+	  h1 { font-size: 50px; text-align: center }
+	  span[frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
+	  body { font: 20px Constantia, 'Hoefler Text',  "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
+	  ::-moz-selection{ background:#FF5E99; color:#fff; }
+	  ::selection { background:#FF5E99; color:#fff; } 
+	  article {display:block; text-align: left; width: 500px; margin: 0 auto; }
+	  
+	  a { color: rgb(36, 109, 56); text-decoration:none; }
+	  a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
+  </style>
+</head>
+<body>
+     <article>
+	  <h1>Not found <span frown>:(</span></h1>
+	   <div>
+	       <p>Sorry, but the page you were trying to view does not exist.</p>
+	       <p>It looks like this was the result of either:</p>
+	       <ul>
+		   <li>a mistyped address</li>
+		   <li>an out-of-date link</li>
+	       </ul>
+	   </div>
+	    
+	    <script>
+	    var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),
+		GOOG_FIXURL_SITE = location.host;
+	    </script>
+	    <script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
+     </article>
+</body>
+</html>

data/templates/project/files/crossdomain.xml

@@ -17,9 +17,9 @@
 	<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
 -->
 <!--
-  If you host a crossdomain.xml file with allow-access-from domain=“*” 	 	
+  If you host a crossdomain.xml file with allow-access-from domain="*" 	 	
   and don’t understand all of the points described here, you probably 	 	
   have a nasty security vulnerability. ~ simon willison
 -->
 
-</cross-domain-policy>
+</cross-domain-policy>

data/templates/project/files/htaccess

@@ -91,7 +91,7 @@ AddEncoding gzip                       svgz
 AddType application/vnd.ms-fontobject  eot
 AddType font/truetype                  ttf
 AddType font/opentype                  otf
-AddType application/x-font-woff              woff
+AddType application/x-font-woff        woff
 
 # assorted types                                      
 AddType image/x-icon                   ico
@@ -215,7 +215,7 @@ AddType application/octet-stream       safariextz
 # webfonts
   ExpiresByType font/truetype             "access plus 1 month"
   ExpiresByType font/opentype             "access plus 1 month"
-  ExpiresByType font/woff                 "access plus 1 month"
+  ExpiresByType application/x-font-woff   "access plus 1 month"
   ExpiresByType image/svg+xml             "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
     
@@ -327,6 +327,61 @@ FileETag None
 
 
 
+# ----------------------------------------------------------------------
+# Add/remove trailing slash to (non-file) URLs
+# ----------------------------------------------------------------------
+
+# Google treats URLs with and without trailing slashes separately.
+# Forcing a trailing slash is usually preferred, but all that's really
+# important is that one correctly redirects to the other.
+
+# By default option 1 (force trailing slash) is activated.
+# http://googlewebmastercentral.blogspot.com/2010/04/to-slash-or-not-to-slash.html
+# http://www.alistapart.com/articles/slashforward/
+# http://httpd.apache.org/docs/2.0/misc/rewriteguide.html#url Trailing Slash Problem
+
+# ----------------------------------------------------------------------
+
+# Option 1:
+# Rewrite "domain.com/foo -> domain.com/foo/"
+
+<IfModule mod_rewrite.c>
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/|#(.*))$
+  RewriteRule ^(.*)$ /$1/ [R=301,L]
+</IfModule>
+
+# ----------------------------------------------------------------------
+
+# Option 2:
+# Rewrite "domain.com/foo/ -> domain.com/foo"
+
+#<IfModule mod_rewrite.c>
+#  RewriteRule ^(.*)/$ /$1 [R=301,L]
+#</IfModule>
+
+
+
+# ----------------------------------------------------------------------
+# Built-in filename-based cache busting
+# ----------------------------------------------------------------------
+
+# If you're not using the build script to manage your filename version revving,
+# you might want to consider enabling this, which will route requests for
+# /css/style.20110203.css to /css/style.css
+
+# To understand why this is important and a better idea than all.css?v1231,
+# read: github.com/paulirish/html5-boilerplate/wiki/Version-Control-with-Cachebusting
+
+# Uncomment to enable.
+# <IfModule mod_rewrite.c>
+#   RewriteCond %{REQUEST_FILENAME} !-f
+#   RewriteCond %{REQUEST_FILENAME} !-d
+#   RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpg|gif)$ $1.$3 [L]
+# </IfModule>
+
+
+	
 # ----------------------------------------------------------------------
 # Prevent SSL cert warnings
 # ----------------------------------------------------------------------
@@ -337,7 +392,7 @@ FileETag None
 
 # <IfModule mod_rewrite.c>
 #   RewriteCond %{SERVER_PORT} !^443
-#   RewriteRule (.*) https://example-domain-please-change.com.com/$1 [R=301,L]
+#   RewriteRule (.*) https://example-domain-please-change-me.com/$1 [R=301,L]
 # </IfModule>
 
 
@@ -388,7 +443,7 @@ AddCharset utf-8 .html .css .js .xml .json .rss
 # "-Indexes" will have Apache block users from browsing folders without a default document
 # Usually you should leave this activated, because you shouldn't allow everybody to surf through
 # every folder on your server (which includes rather private places like CMS system folders).
-# Options -Indexes
+Options -Indexes
 
 
 # Block access to "hidden" directories whose names begin with a period. This
@@ -416,5 +471,8 @@ AddCharset utf-8 .html .css .js .xml .json .rss
 # php_flag register_globals Off
 
 
-
+# Increase cookie security
+<IfModule php5_module>
+php_value session.cookie_httponly true
+</IfModule>