Permalink
Browse files

Updated to version 0.1.7

- includes latest version of html5-boilerplate
  • Loading branch information...
1 parent 905c95e commit ee111dc3a2dce6525f3f9c9ccd1566db90787878 @khelben committed Apr 25, 2012
View
@@ -35,7 +35,7 @@ task :update_files => :patch_files do |t|
# stylesheets
'html5-boilerplate/css/style.css' => 'vendor/assets/stylesheets/reset.css',
# javascripts
- 'html5-boilerplate/js/libs/modernizr-2.0.6.min.js' => 'vendor/assets/javascripts/modernizr.js',
+ 'html5-boilerplate/js/vendor/modernizr-2.5.3.min.js' => 'vendor/assets/javascripts/modernizr.js',
'html5-boilerplate/js/plugins.js' => 'vendor/assets/javascripts/plugins.js',
# public files
'html5-boilerplate/robots.txt' => 'lib/generators/boilerplate/install/templates',
View
@@ -1,71 +1,59 @@
---- html5-boilerplate/index.html 2011-11-23 20:13:05.000000000 +0100
-+++ lib/generators/boilerplate/install/templates/index.html 2012-01-27 18:45:16.000000000 +0100
-@@ -12,50 +12,35 @@
- More info: h5bp.com/b/378 -->
+--- html5-boilerplate/index.html 2012-04-25 21:17:20.000000000 +0200
++++ lib/generators/boilerplate/install/templates/index.html 2012-04-25 21:52:04.000000000 +0200
+@@ -11,7 +11,7 @@
+ More info: h5bp.com/i/378 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title></title>
+ <title><%= application_name %></title>
<meta name="description" content="">
- <meta name="author" content="">
-- <!-- Mobile viewport optimized: h5bp.com/viewport -->
-+ <!-- Mobile viewport optimized: j.mp/bplateviewport -->
- <meta name="viewport" content="width=device-width,initial-scale=1">
+ <!-- Mobile viewport optimized: h5bp.com/viewport -->
+@@ -19,14 +19,15 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
- <link rel="stylesheet" href="css/style.css">
--
+ <%%= stylesheet_link_tag "application" %>
+ <%%= csrf_meta_tags %>
-+
+
<!-- More ideas for your <head> here: h5bp.com/d/head-Tips -->
- <!-- All JavaScript at the bottom, except this Modernizr build incl. Respond.js
-- Respond is a polyfill for min/max-width media queries. Modernizr enables HTML5 elements & feature detects;
-+ Respond is a polyfill for min/max-width media queries. Modernizr enables HTML5 elements & feature detects;
- for optimal performance, create your own custom Modernizr build: www.modernizr.com/download/ -->
-- <script src="js/libs/modernizr-2.0.6.min.js"></script>
-+ <%%= javascript_include_tag "modernizr" %>
+ <!-- All JavaScript at the bottom, except this Modernizr build.
+ Modernizr enables HTML5 elements & feature detects for optimal performance.
+ Create your own custom Modernizr build: www.modernizr.com/download/ -->
+- <script src="js/vendor/modernizr-2.5.3.min.js"></script>
++ <%%= javascript_include_tag 'modernizr' %>
</head>
-
<body>
-- <header>
--
-- </header>
-- <div role="main">
--
-- </div>
-- <footer>
--
-- </footer>
+ <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
+@@ -34,19 +35,12 @@
+ <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
+
+ <!-- Add your site or application content here -->
-
+ <%%= yield %>
- <!-- JavaScript at the bottom for fast page loading -->
--
+ <!-- JavaScript at the bottom for fast page loading: http://developer.yahoo.com/performance/rules.html#js_bottom -->
++ <%%= javascript_include_tag 'application' %>
+
- <!-- 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.7.0/jquery.min.js"></script>
-- <script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.0.min.js"><\/script>')</script>
--
+- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+- <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.7.2.min.js"><\/script>')</script>
-
- <!-- scripts concatenated and minified via build script -->
-- <script defer src="js/plugins.js"></script>
-- <script defer src="js/script.js"></script>
-+ <%%= javascript_include_tag "application" %>
- <!-- end scripts -->
-
-
+- <script src="js/plugins.js"></script>
+- <script src="js/main.js"></script>
+- <!-- end scripts -->
+-
+ <%% if Rails.env.production? %>
<!-- Asynchronous Google Analytics snippet. Change UA-XXXXX-X to be your site's ID.
mathiasbynens.be/notes/async-analytics-snippet -->
<script>
-@@ -64,6 +49,7 @@
+@@ -55,5 +49,6 @@
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
-+ <%% end %>
-
- <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
- chromium.org/developers/how-tos/chrome-frame-getting-started -->
++ <% end %>
+ </body>
+ </html>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
@@ -3,21 +3,19 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!-- Consider adding a manifest.appcache: h5bp.com/d/Offline -->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<!-- Use the .htaccess and remove these lines to avoid edge case issues.
- More info: h5bp.com/b/378 -->
+ More info: h5bp.com/i/378 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><%= application_name %></title>
<meta name="description" content="">
- <meta name="author" content="">
- <!-- Mobile viewport optimized: j.mp/bplateviewport -->
- <meta name="viewport" content="width=device-width,initial-scale=1">
+ <!-- Mobile viewport optimized: h5bp.com/viewport -->
+ <meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
@@ -26,19 +24,21 @@
<!-- More ideas for your <head> here: h5bp.com/d/head-Tips -->
- <!-- All JavaScript at the bottom, except this Modernizr build incl. Respond.js
- Respond is a polyfill for min/max-width media queries. Modernizr enables HTML5 elements & feature detects;
- for optimal performance, create your own custom Modernizr build: www.modernizr.com/download/ -->
- <%%= javascript_include_tag "modernizr" %>
+ <!-- All JavaScript at the bottom, except this Modernizr build.
+ Modernizr enables HTML5 elements & feature detects for optimal performance.
+ Create your own custom Modernizr build: www.modernizr.com/download/ -->
+ <%%= javascript_include_tag 'modernizr' %>
</head>
-
<body>
- <%%= yield %>
+ <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
+ chromium.org/developers/how-tos/chrome-frame-getting-started -->
+ <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
- <!-- JavaScript at the bottom for fast page loading -->
- <%%= javascript_include_tag "application" %>
- <!-- end scripts -->
+ <!-- Add your site or application content here -->
+ <%%= yield %>
+ <!-- JavaScript at the bottom for fast page loading: http://developer.yahoo.com/performance/rules.html#js_bottom -->
+ <%%= javascript_include_tag 'application' %>
<%% if Rails.env.production? %>
<!-- Asynchronous Google Analytics snippet. Change UA-XXXXX-X to be your site's ID.
@@ -50,13 +50,5 @@
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
<%% end %>
-
- <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
- chromium.org/developers/how-tos/chrome-frame-getting-started -->
- <!--[if lt IE 7 ]>
- <script defer src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
- <script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
- <![endif]-->
-
</body>
</html>
@@ -1,5 +1,4 @@
# www.robotstxt.org/
-# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
+# https://developers.google.com/webmasters/control-crawl-index/
User-agent: *
-
@@ -1,3 +1,3 @@
module RailsBoilerplate
- VERSION = "0.1.6"
+ VERSION = "0.1.7"
end

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,19 +1,10 @@
-
// usage: log('inside coolFunc', this, arguments);
// paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
-window.log = function(){
- log.history = log.history || []; // store logs to an array for reference
- log.history.push(arguments);
- if(this.console) {
- arguments.callee = arguments.callee.caller;
- var newarr = [].slice.call(arguments);
- (typeof console.log === 'object' ? log.apply.call(console.log, console, newarr) : console.log.apply(console, newarr));
- }
-};
+window.log = function f(){ log.history = log.history || []; log.history.push(arguments); if(this.console) { var args = arguments, newarr; try { args.callee = f.caller } catch(e) {}; newarr = [].slice.call(args); if (typeof console.log === 'object') log.apply.call(console.log, console, newarr); else console.log.apply(console, newarr);}};
// make it safe to use console.log always
-(function(b){function c(){}for(var d="assert,clear,count,debug,dir,dirxml,error,exception,firebug,group,groupCollapsed,groupEnd,info,log,memoryProfile,memoryProfileEnd,profile,profileEnd,table,time,timeEnd,timeStamp,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try
-{console.log();return window.console;}catch(err){return window.console={};}})());
+(function(a){function b(){}for(var c="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,markTimeline,profile,profileEnd,time,timeEnd,trace,warn".split(","),d;!!(d=c.pop());){a[d]=a[d]||b;}})
+(function(){try{console.log();return window.console;}catch(a){return (window.console={});}}());
// place any jQuery/helper plugins in here, instead of separate, slower script files.
@@ -1,5 +1,5 @@
/*
- * HTML5 Boilerplate
+ * HTML5 Boilerplate
*
* What follows is the result of much research on cross-browser styling.
* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
@@ -27,24 +27,23 @@ audio:not([controls]) { display: none; }
/*
* 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
- * 2. Force vertical scrollbar in non-IE
- * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ * 2. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
*/
-html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
+html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-body { margin: 0; font-size: 1em; line-height: 1.4; }
+html, button, input, select, textarea { font-family: sans-serif; color: #222; }
-body, button, input, select, textarea { font-family: sans-serif; color: #222; }
+body { margin: 0; font-size: 1em; line-height: 1.4; }
/*
* Remove text-shadow in selection highlight: h5bp.com/i
- * These selection declarations have to be separate
- * Also: hot pink! (or customize the background color to match your design)
+ * These selection declarations have to be separate.
+ * Customize the background color to match your design.
*/
-::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
-::selection { background: #fe57a1; color: #fff; text-shadow: none; }
+::-moz-selection { background: #b3d4fc; text-shadow: none; }
+::selection { background: #b3d4fc; text-shadow: none; }
/* =============================================================================
@@ -110,7 +109,7 @@ nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0
/*
* 1. Improve image quality when scaled in IE7: h5bp.com/d
- * 2. Remove the gap between images and borders on image containers: h5bp.com/e
+ * 2. Remove the gap between images and borders on image containers: h5bp.com/i/440
*/
img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
@@ -144,7 +143,7 @@ label { cursor: pointer; }
* 2. Correct alignment displayed oddly in IE6/7
*/
-legend { border: 0; *margin-left: -7px; padding: 0; }
+legend { border: 0; *margin-left: -7px; padding: 0; white-space: normal; }
/*
* 1. Correct font-size not inheriting in all browsers
@@ -169,12 +168,18 @@ button, input { line-height: normal; }
button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; }
/*
+ * Re-set default cursor for disabled elements
+ */
+
+button[disabled], input[disabled] { cursor: default; }
+
+/*
* Consistent box sizing and appearance
*/
-input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; }
+input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; *width: 13px; *height: 13px; }
input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
-input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; }
/*
* Remove inner padding and border in FF3/4: h5bp.com/l
@@ -202,6 +207,13 @@ table { border-collapse: collapse; border-spacing: 0; }
td { vertical-align: top; }
+/* =============================================================================
+ Chrome Frame Prompt
+ ========================================================================== */
+
+.chromeframe { margin: 0.2em 0; background: #ccc; color: black; padding: 0.2em 0; }
+
+
/* ==|== primary styles =====================================================
Author:
========================================================================== */
@@ -222,19 +234,13 @@ td { vertical-align: top; }
/* ==|== media queries ======================================================
- PLACEHOLDER Media Queries for Responsive Design.
- These override the primary ('mobile first') styles
+ EXAMPLE Media Query for Responsive Design.
+ This example overrides the primary ('mobile first') styles
Modify as content requires.
========================================================================== */
-@media only screen and (min-width: 480px) {
- /* Style adjustments for viewports 480px and over go here */
-
-}
-
-@media only screen and (min-width: 768px) {
- /* Style adjustments for viewports 768px and over go here */
-
+@media only screen and (min-width: 35em) {
+ /* Style adjustments for viewports that meet the condition */
}
@@ -244,8 +250,7 @@ td { vertical-align: top; }
========================================================================== */
/* For image replacement */
-.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; *line-height: 0; }
-.ir br { display: none; }
+.ir { border: 0; font: 0/0 a; text-shadow: none; color: transparent; background-color: transparent; }
/* Hide from both screenreaders and browsers: h5bp.com/u */
.hidden { display: none !important; visibility: hidden; }
@@ -272,11 +277,11 @@ td { vertical-align: top; }
========================================================================== */
@media print {
- * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */
+ * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; } /* Black prints faster: h5bp.com/s */
a, a:visited { text-decoration: underline; }
a[href]:after { content: " (" attr(href) ")"; }
abbr[title]:after { content: " (" attr(title) ")"; }
- .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */
+ .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */
pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
thead { display: table-header-group; } /* h5bp.com/t */
tr, img { page-break-inside: avoid; }

0 comments on commit ee111dc

Please sign in to comment.