framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add updates from H5BP

Browse Source
This commit is contained in:
Ben Word
2012-04-29 20:01:47 -06:00
parent 44997560bb
commit 8a3b2cf142
8 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
inc/h5bp-htaccess
View File

@@ -1,5 +1,3 @@
# BEGIN HTML5 Boilerplate
###
### This contains the HTML5 Boilerplate .htaccess that can be found at:
### github.com/h5bp/html5-boilerplate/blob/master/.htaccess
@@ -96,16 +94,18 @@
# JavaScript
# Normalize to standard type (it's sniffed in IE anyways)
# tools.ietf.org/html/rfc4329#section-7.2
AddType application/javascript js
AddType application/javascript js jsonp
AddType application/json json
# Audio
AddType audio/ogg oga ogg
AddType audio/mp4 m4a
AddType audio/mp4 m4a f4a f4b
# Video
AddType video/ogg ogv
AddType video/mp4 mp4 m4v
AddType video/mp4 mp4 m4v f4v f4p
AddType video/webm webm
AddType video/x-flv flv
# SVG
# Required for svg webfonts on iPad
@@ -124,12 +124,14 @@ AddType image/x-icon ico
AddType image/webp webp
AddType text/cache-manifest appcache manifest
AddType text/x-component htc
AddType application/xml rss atom xml rdf
AddType application/x-chrome-extension crx
AddType application/x-opera-extension oex
AddType application/x-xpinstall xpi
AddType application/octet-stream safariextz
AddType application/x-web-app-manifest+json webapp
AddType text/x-vcard vcf
AddType application/x-shockwave-flash swf
@@ -213,8 +215,7 @@ AddType text/x-vcard vcf
# ----------------------------------------------------------------------
# These are pretty far-future expires headers.
# They assume you control versioning with cachebusting query params like
# <script src="application.js?20100608">
# They assume you control versioning with filename-based cache busting
# Additionally, consider that outdated proxies may miscache
# www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
@@ -269,11 +270,7 @@ AddType text/x-vcard vcf
# ExpiresByType text/css "access plus 1 year"
# ExpiresByType application/javascript "access plus 1 year"
# <IfModule mod_headers.c>
# Header append Cache-Control "public"
# </IfModule>
# </IfModule>
</IfModule>
@@ -327,10 +324,14 @@ AddType text/x-vcard vcf
# Turning on the rewrite engine is necessary for the following rules and features.
# FollowSymLinks must be enabled for this to work.
#
# Some cloud hosting services require RewriteBase to be set: goo.gl/HOcPN
# If using the h5bp in a subdirectory, use `RewriteBase /foo` instead where 'foo' is your directory.
# <IfModule mod_rewrite.c>
# Options +FollowSymlinks
# RewriteEngine On
# # RewriteBase /
# </IfModule>
@@ -385,7 +386,7 @@ AddType text/x-vcard vcf
# /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/h5bp/html5-boilerplate/wiki/Version-Control-with-Cachebusting
# read: github.com/h5bp/html5-boilerplate/wiki/cachebusting
# Uncomment to enable.
# <IfModule mod_rewrite.c>
@@ -427,6 +428,8 @@ AddType text/x-vcard vcf
# ----------------------------------------------------------------------
# You can add custom pages to handle 500 or 403 pretty easily, if you like.
# If you are hosting your site in subdirectory, adjust this accordingly
# e.g. ErrorDocument 404 /subdir/404.html
# ErrorDocument 404 /404.html
@@ -509,6 +512,9 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
# Rename session cookie to something else, than PHPSESSID
# php_value session.name sid
# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
# php_flag magic_quotes_gpc Off
# Do not show you are using PHP
# Note: Move this line to php.ini since it won't work in .htaccess
# php_flag expose_php Off
@@ -547,6 +553,4 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
# Increase cookie security
<IfModule php5_module>
php_value session.cookie_httponly true
</IfModule>
# END HTML5 Boilerplate
</IfModule>

2
inc/roots-scripts.php
View File

@@ -24,7 +24,7 @@ function roots_scripts() {
}
wp_register_script('roots_plugins', get_template_directory_uri() . '/js/plugins.js', false, null, false);
wp_register_script('roots_script', get_template_directory_uri() . '/js/script.js', false, null, false);
wp_register_script('roots_main', get_template_directory_uri() . '/js/main.js', false, null, false);
wp_enqueue_script('roots_plugins');
wp_enqueue_script('roots_script');
}