Merge branch 'master' into stripped

ak2consulting · Oct 26, 2010 · bc26412 · bc26412
2 parents 302fb00 + fbc29b3
commit bc26412
Show file tree

Hide file tree

Showing 45 changed files with 10,423 additions and 639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.svn/
+publish/
+build/buildinfo.properties
 .DS_Store
-
-.sass-cache
diff --git a/.htaccess b/.htaccess
@@ -1,8 +1,9 @@
 # Apache configuration file
 # httpd.apache.org/docs/2.2/mod/quickreference.html
 
-# Techniques in here adapted from all over, 
-#   including Kroc Camen: camendesign.com/.htaccess
+# Techniques in here adapted from all over, including:
+#   Kroc Camen: camendesign.com/.htaccess
+#   perishablepress.com/press/2006/01/10/stupid-htaccess-tricks/
 
 
 # Force the latest IE version, in various cases when it may fall back to IE7 mode
@@ -15,6 +16,12 @@
   </IfModule>
 </IfModule>
 
+<IfModule mod_headers.c>
+# Because X-UA-Compatible isn't sent to non-IE (to save header bytes),
+#   We need to inform proxies that content changes based on UA
+  Header append Vary User-Agent
+# Cache control is set only if mod_headers is enabled, so that's unncessary to declare
+</IfModule>
 
 # hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
 # Disabled. Uncomment to serve cross-domain ajax requests
@@ -37,21 +44,30 @@
 
 
 # video
-AddType video/ogg  ogg ogv
-AddType video/mp4  mp4
-AddType video/webm webm
+AddType video/ogg                      ogg ogv
+AddType video/mp4                      mp4
+AddType video/webm                     webm
 
 # Proper svg serving. Required for svg webfonts on iPad
 #   twitter.com/FontSquirrel/status/14855840545
-AddType image/svg+xml                 svg svgz 
+AddType     image/svg+xml              svg svgz 
+AddEncoding gzip                       svgz
+
+# webfonts                             
+AddType application/vnd.ms-fontobject  eot
+AddType font/truetype                  ttf
+AddType font/opentype                  otf
+AddType font/woff                      woff
+
+# assorted types                                      
+AddType image/vnd.microsoft.icon       ico
+AddType image/webp                     webp
+AddType text/cache-manifest            manifest
+AddType text/x-component               htc
+AddType application/x-chrome-extension crx
+
 
-# webfonts
-AddType application/vnd.ms-fontobject eot
-AddType font/ttf                      ttf
-AddType font/otf                      otf
-AddType font/x-woff                   woff
 
-AddType text/cache-manifest           manifest
 
 # allow concatenation from within specific js and css files 
 
@@ -66,7 +82,7 @@ AddType text/cache-manifest           manifest
 # Disabled by default.
 
 # <FilesMatch "\.combined\.(js|css)$">
-#         Options +IncludesNOEXEC
+#         Options +Includes
 #         SetOutputFilter INCLUDES
 # </FilesMatch>
 
@@ -77,8 +93,10 @@ AddType text/cache-manifest           manifest
 # gzip compression.
 <IfModule mod_deflate.c>
 
-# html, xml, css, and js:
-  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript text/javascript application/javascript application/json 
+# html, txt, css, js, json, xml, htc:
+  AddOutputFilterByType DEFLATE text/html text/plain text/css application/json
+  AddOutputFilterByType DEFLATE text/javascript application/javascript application/x-javascript 
+  AddOutputFilterByType DEFLATE text/xml application/xml text/x-component
 
 # webfonts and svg:
   <FilesMatch "\.(ttf|otf|eot|svg)$" >
@@ -88,7 +106,6 @@ AddType text/cache-manifest           manifest
 
 
 
-
 # these are pretty far-future expires headers
 # they assume you control versioning with cachebusting query params like
 #   <script src="application.js?20100608">
@@ -99,17 +116,23 @@ AddType text/cache-manifest           manifest
 #   "access plus 1 week" or so
 
 <IfModule mod_expires.c>
-  Header set cache-control: public
+  Header set Cache-Control "public"
   ExpiresActive on
 
 # Perhaps better to whitelist expires rules? Perhaps.
   ExpiresDefault                          "access plus 1 month"
 
-# cache.manifest needs re-reqeusts in FF 3.6 (thx Remy ~Introducing HTML5)
+# cache.manifest needs re-requests in FF 3.6 (thx Remy ~Introducing HTML5)
   ExpiresByType text/cache-manifest       "access plus 0 seconds"
 
 # your document html 
-  ExpiresByType text/html                  "access"
+  ExpiresByType text/html                 "access plus 0 seconds"
+
+# data
+  ExpiresByType text/xml                  "access plus 0 seconds"
+  ExpiresByType application/xml           "access plus 0 seconds"
+  ExpiresByType application/json          "access plus 0 seconds"
+
 
 # rss feed
   ExpiresByType application/rss+xml       "access plus 1 hour"
@@ -118,18 +141,22 @@ AddType text/cache-manifest           manifest
   ExpiresByType image/vnd.microsoft.icon  "access plus 1 week" 
 
 # media: images, video, audio
+  ExpiresByType image/gif                 "access plus 1 month"
   ExpiresByType image/png                 "access plus 1 month"
   ExpiresByType image/jpg                 "access plus 1 month"
   ExpiresByType image/jpeg                "access plus 1 month"
   ExpiresByType video/ogg                 "access plus 1 month"
   ExpiresByType audio/ogg                 "access plus 1 month"
   ExpiresByType video/mp4                 "access plus 1 month"
+  ExpiresByType video/webm                "access plus 1 month"
 
 # webfonts
-  ExpiresByType font/ttf                  "access plus 1 month"
+  ExpiresByType font/truetype             "access plus 1 month"
+  ExpiresByType font/opentype             "access plus 1 month"
   ExpiresByType font/woff                 "access plus 1 month"
   ExpiresByType image/svg+xml             "access plus 1 month"
-
+  ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
+
 # css and javascript
   ExpiresByType text/css                  "access plus 1 month"
   ExpiresByType application/javascript    "access plus 1 month"
@@ -159,13 +186,15 @@ FileETag None
 
 # you probably want www.example.com to forward to example.com -- shorter URLs are sexier.
 #   no-www.org/faq.php?q=class_b
-RewriteEngine On
-RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
-RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
-
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteCond %{HTTPS} !=on
+  RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+  RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+</IfModule>
 
-# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the same name does not exist (e.g. “/blog/hello”)
-#   webmasterworld.com/apache/3808792.htm
+# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the same name does not exist 
+#   e.g. /blog/hello : webmasterworld.com/apache/3808792.htm
 Options -MultiViews 
 # -Indexes will have Apache block users from browsing folders without a default document
 # Options -Indexes
@@ -184,3 +213,8 @@ AddCharset utf-8 .html .css .js .xml .json .rss
 
 
 
+# We don't need to tell everyone we're apache.
+ServerSignature Off
+
+
+
diff --git a/404.html b/404.html
@@ -5,6 +5,9 @@
 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; }

diff --git a/README.markdown b/README.markdown
@@ -1,11 +1,68 @@
 #  HTML5 Boilerplate [http://html5boilerplate.com](http://html5boilerplate.com)
 
+## Changelog:
 
-## License:
-
-[The Unlicense](http://unlicense.org) (aka: public domain) 
+### v.0.9.5 : October 25th, 2010
+
+Major changes:
+
+<ul>
+<li>Removed <code>-webkit-font-smoothing: antialiased;</code> it makes monospace too thin.</li>
+<li>IE conditional classes have moved from the <code>&lt;body&gt;</code> tag to the <code>&lt;html&gt;</code> tag ( #44 ).</li>
+<li>Dropped <code>text-rendering: <a href="http://www.aestheticallyloyal.com/public/optimize-legibility/">optimizeLegibility</a></code> as it breaks small-caps, looks odd on Linux machines, and goes invisible on WebOS.</li> 
+<li>Added a IE6 call for the minified <code>dd_belatedpng</code>.</li>
+<li>Revised viewport declaration to allow user scaling and clear Webkit console errors ( #37 ).</li>
+<li>Updated Modernizr to 1.6 </li>
+<li>Added <code>web.config</code> file for Microsoft IIS</li>
+<li>Beta release of the <a href="http://github.com/paulirish/html5-boilerplate/wiki/Build-script ">Build Script</a> (this is HUGE)</li>
+<li>New project scaffolding <a href="http://github.com/paulirish/html5-boilerplate/wiki/makep.sh">bash script</a>.</li>
+<li><a href="http://github.com/paulirish/html5-boilerplate/blob/master/README.markdown">.... and over 100 other fixes and improvements.</a></li>
+</ul>
+
+#### General
+* Updated Modernizr to 1.6 (smaller and faster)
+* Added web.config file for Microsoft IIS. Now forcing latest IE version and ChromeFrame, if installed.
+* Added favicon and default icon for iOS.
+* Updated crossdomain.xml wording for better security guidelines ( #124 ).
+* Expires value for nginx.conf corrected.
+* License clarified.
+
+#### style.css
+* Removed -webkit-font-smoothing: antialiased; as it made monospace too thin.
+* Updated fonts normalization to YUI 3.2.0 PR1.
+* Table Header set explicitly for IE6 and table row now has page-break: avoid in print CSS.
+* text-shadow:none !important set for all text in print css.
+* Removed scrollbar from textareas in IE.
+* Fixed textarea stylings and form field treatment for validity. Added default background-color.
+* New robust clearfix solution without IE 5.5 hack ( #45 #126 ).
+* Margins for form-elements explicitly set to 0 as webkit adds 2px space around form elements' chrome. 
+* Dropped text-rendering: optimizeLegibility as it breaks small-caps and looks odd on Linux machines. 
+* Lists now have a left margin of 1.8em. Default list-style-type for ordered list is decimal.
+* Image Replacement now works with right-to-left text ( #68 ).
+* Removed "Star Hack" for checkboxes in favor of .ie7 selector.
+
+#### index.html
+* IE conditional classes have moved from the <body> tag to the <html> tag ( #44 ).
+* Added a IE6 call for the minified dd_belatedpng.
+* Google Analytics script will now work with SSL in IE6.
+* Added protocol independent absolute path for cdn jquery, with improved fallback-to-local code to protect against edge case IE bug.
+* Commented out handheld CSS ( #73 ).
+* Mobile viewport and textsize styles adjusted per group feedback ( #37 ).
+
+#### .htaccess
+* More files are served via gzip like .htc ( #55 ).
+* Added Expires header for content types image/gif and video/webm.
+* Fixed favicon display in IE6 ( #113 ).
+* Corrected mimetypes for fonts.
+* Removed caching for files of type json/xml.
+* Better use of ifmodule for more stability in different Apache environments.
+
+[View full diff and commit history](http://github.com/paulirish/html5-boilerplate/compare/v0.9.1)
+
+
+#### Contributors
+Shi Chuan, Rob Larsen, Ivan Nikolić, Mikko Tikkanen, Paul Neave, Weston Ruter, Jeffrey Barke, Robert Meissner, SirFunk, Philip von Bargen, Kroc Camen, Andreas Madsen, Marco d'Itri, Adeelejaz, James Rosen, Dave DeSandro, Ken Newman, Swaroop C H, Yann Mainier, Joe Sak, Irakli, Rob Flaherty, Jeff Starr, Mike Lamb, Holek, Aaron Peters, Kaelig, Meander, Charlie Ussery, Ciney, Région Wallonne and Paul Hayes.
 
-## Changelog:
 
 ### v.0.9.1 : August 13th, 2010
 * HTML5 Boilerplate is now in the Public Domain
@@ -26,6 +83,23 @@ voodootikigod, garowetz, fearphage, christopherjacob, mathias byenens, daniel ha
 
 ### v0.9 : August 10th, 2010 - Initial release
 
+
+## License:
+
+Major components:
+
+* Modernizr: MIT/BSD license
+* jQuery: MIT/GPL license
+* DD_belatedPNG: MIT license
+* YUI Profiling: BSD license
+* HTML5Doctor CSS reset: Creative Commons 3.0 BY
+* CSS Reset Reloaded: Public Domain
+
+Everything else:
+
+* [The Unlicense](http://unlicense.org) (aka: public domain) 
+
+
 ## Summary:
 
 This is a set of files that a front-end developer can use to get started on a website, with following included:
@@ -49,7 +123,7 @@ This is a set of files that a front-end developer can use to get started on a we
 
 ## Releases 
 
-There will be two releases: a documented release, which is exactly what you see here, and a production release, with most of the descriptive comments stripped out.
+There are two releases: a documented release, which is exactly what you see here, and a "stripped" release, with most of the descriptive comments stripped out.
 
 Watch the [current tickets](http://github.com/paulirish/html5-boilerplate/issues) to view the areas of active development.
 
diff --git a/apple-touch-icon.png b/apple-touch-icon.png
diff --git a/build/build.properties b/build/build.properties
@@ -0,0 +1,3 @@
+# build.properties file defines overrides for default.properties
+# Explaination: This file should be created by each user as and when he or she needs to override particular values. 
+# Consequently, it should not be placed under version control.