Merge master

This commit is contained in:
Ben Word
2013-03-04 21:30:25 -06:00
23 changed files with 261 additions and 261 deletions

View File

@@ -5,7 +5,7 @@
### https://github.com/h5bp/server-configs/blob/master/apache/.htaccess
###
### Added:
### Block access to access to WordPress files that reveal version information.
### Block access to WordPress files that reveal version information.
###
### Removed:
### Expires headers: Use W3 Total Cache
@@ -417,4 +417,4 @@ AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
# Increase cookie security
<IfModule mod_php5.c>
php_value session.cookie_httponly true
</IfModule>
</IfModule>

View File

@@ -12,7 +12,7 @@
* 3. /theme/assets/js/main.min.js (in footer)
*/
function roots_scripts() {
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '99a8db779c85fab09c1780951893470f');
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'cad8f7f7e4be4fd457ecb1eee9ff7e93');
// Load style.css from child theme
if (is_child_theme()) {
@@ -32,7 +32,7 @@ function roots_scripts() {
}
wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.6.2.min.js', false, null, false);
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '7103cef06004b25ce6b9258e83d475ef', true);
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '2889bb2f21e80b03b270797843bf4c2d', true);
wp_enqueue_script('modernizr');
wp_enqueue_script('jquery');
wp_enqueue_script('roots_scripts');