Skip to content

Commit 78f1629

Browse files
author
Matthew Hudson
committed
Updated to the latest Boilerplate version and removed superfluous
assets such as .htaccess, ngnix.conf, and DD_BelatedPNG which are no longer part of the H5BP codebase.
1 parent 7c1a025 commit 78f1629

31 files changed

+1102
-4342
lines changed

‎README.markdown

-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ These files can be found in the html5-boilerplate folder in the theme (html5-boi
2727
### 404 Page
2828
If you use permanlinks (WP-Admin > Settings > Permalinks), then WordPress handles any 404s with the 404.php included in the theme. If you don't use permalinks, then add the 404.html file to the root of your site.
2929

30-
### .htaccess
31-
**Do not copy to the root of your site.** This may overwrite the WordPress htaccess, and break Wordpress. Instead, copy and paste the contents of this file to the .htaccess already at the root of your site, after the existing content. It would be good to make a comment where the Boilerplate content begins, like "# Begin HTML5 Boilerplate". Read htaccess file for more info on what it does.
32-
**This file may not be visible if you're viewing the folder on your computer. Files that start with a "." are often hidden. It should be visible through your FTP browser once uploaded.**
33-
34-
### nginx.conf
35-
Used for a different type of web server than Apache. You don't need it.
36-
3730
### crossdomain.xml
3831
If you don't know what this is, you probably don't need it.
3932
www.adobe.com/devnet/flashplayer/articles/cross_domain_policy.html

‎footer.php

+13-17
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,26 @@
1919
<!-- Javascript at the bottom for fast page loading -->
2020

2121
<!-- Grab Google CDN's jQuery. fall back to local if necessary -->
22-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
23-
<script>!window.jQuery && document.write('<script src="<?php echo $GLOBALS["TEMPLATE_RELATIVE_URL"] ?>html5-boilerplate/js/jquery-1.4.2.min.js"><\/script>')</script>
22+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
23+
<script>window.jQuery || document.write('<script src="<?php echo $GLOBALS["TEMPLATE_RELATIVE_URL"] ?>js/vendor/jquery-1.8.0.min.js"><\/script>')</script>
2424

2525

2626
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/plugins.js") ?>
27-
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/script.js") ?>
28-
29-
30-
<!--[if lt IE 7 ]>
31-
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/dd_belatedpng.js") ?>
32-
<![endif]-->
33-
34-
35-
<!-- yui profiler and profileviewer - remove for production -->
36-
<!-- <?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/profiling/yahoo-profiling.min.js") ?>
37-
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/profiling/config.js") ?> -->
38-
<!-- end profiling code -->
39-
27+
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/main.js") ?>
4028

4129
<!-- asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
4230
change the UA-XXXXX-X to be your site's ID -->
43-
<!-- WordPress does not allow Google Analytics code to be built into themes they host.
31+
<!-- WordPress.com does not allow Google Analytics code to be built into themes they host.
4432
Add this section from HTML Boilerplate manually (html5-boilerplate/index.html), or use a Google Analytics WordPress Plugin-->
45-
33+
34+
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
35+
<script>
36+
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
37+
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
38+
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
39+
s.parentNode.insertBefore(g,s)}(document,'script'));
40+
</script>
41+
4642
<?php wp_footer(); ?>
4743

4844
</body>

‎header.php

+33-46
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,49 @@
44
* @subpackage HTML5_Boilerplate
55
*/
66
?>
7-
<!doctype html>
8-
<html lang="en" class="no-js">
9-
<head>
10-
<meta charset="utf-8">
11-
12-
<!-- www.phpied.com/conditional-comments-block-downloads/ -->
13-
<!--[if IE]><![endif]-->
14-
15-
<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
7+
<!DOCTYPE html>
8+
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
9+
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
10+
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
11+
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
12+
<head>
13+
<meta charset="utf-8">
14+
15+
<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
1616
Remove this if you use the .htaccess -->
17-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
18-
<!-- Does not currently validate. Known issue with the Boilerplate. -->
19-
20-
<title><?php wp_title('&laquo;', true, 'right'); ?> <?php bloginfo('name'); ?></title>
21-
<meta name="description" content="">
22-
<meta name="author" content="">
23-
24-
<!-- Mobile Viewport Fix
25-
j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
26-
device-width : Occupy full width of the screen in its current orientation
27-
initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
28-
maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
29-
-->
30-
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
17+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
3118

32-
<!-- Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references -->
33-
<link rel="shortcut icon" href="/favicon.ico">
34-
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
19+
<title><?php wp_title('&laquo;', true, 'right'); ?> <?php bloginfo('name'); ?></title>
20+
21+
<meta name="description" content="">
22+
<meta name="author" content="">
23+
24+
<meta name="viewport" content="width=device-width">
3525

36-
<!-- CSS : implied media="all" -->
37-
<?php versioned_stylesheet($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/css/style.css") ?>
26+
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
3827

39-
<!-- For the less-enabled mobile browsers like Opera Mini -->
40-
<?php versioned_stylesheet($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/css/handheld.css", 'media="handheld"') ?>
28+
<?php versioned_stylesheet($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/css/normalize.css") ?>
29+
<?php versioned_stylesheet($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/css/main.css") ?>
30+
31+
<!-- Wordpress Templates require a style.css in theme root directory -->
32+
<?php versioned_stylesheet($GLOBALS["TEMPLATE_RELATIVE_URL"]."style.css") ?>
33+
34+
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
35+
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/vendor/modernizr-2.6.1.min.js") ?>
4136

42-
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
43-
<?php versioned_javascript($GLOBALS["TEMPLATE_RELATIVE_URL"]."html5-boilerplate/js/modernizr-1.5.min.js") ?>
37+
<!-- Wordpress Head Items -->
38+
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
4439

45-
<!-- Wordpress Head Items -->
46-
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
47-
48-
<?php wp_head(); ?>
40+
<?php wp_head(); ?>
4941

5042
</head>
51-
52-
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
53-
54-
<!--[if lt IE 7 ]> <body <?php body_class('ie6'); ?>> <![endif]-->
55-
<!--[if IE 7 ]> <body <?php body_class('ie7'); ?>> <![endif]-->
56-
<!--[if IE 8 ]> <body <?php body_class('ie8'); ?>> <![endif]-->
57-
<!--[if IE 9 ]> <body <?php body_class('ie9'); ?>> <![endif]-->
58-
<!--[if (gt IE 9)|!(IE)]><!--> <body <?php body_class('ie6'); ?>> <!--<![endif]-->
43+
<body>
44+
<!--[if lt IE 7]>
45+
<p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
46+
<![endif]-->
5947

6048
<div id="container">
6149
<header role="banner">
6250
<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
6351
<p class="description"><?php bloginfo('description'); ?></p>
64-
</header>
65-
52+
</header>

‎html5-boilerplate/.htaccess

-186
This file was deleted.

0 commit comments

Comments
 (0)