Merge master

This commit is contained in:
Ben Word
2012-12-11 16:19:08 -06:00
50 changed files with 1290 additions and 408 deletions

View File

@@ -7,23 +7,23 @@
*
* Enqueue scripts in the following order:
* 1. /theme/assets/js/vendor/modernizr-2.6.2.min.js (in head.php)
* 2. jquery-1.8.2.min.js via Google CDN (in head.php)
* 2. jquery-1.8.3.min.js via Google CDN (in head.php)
* 3. /theme/assets/js/scripts.min.js
*/
function roots_scripts() {
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'a66feb69f8e39965cd2a11e48a1448a6');
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '78911fc28d7ea4e9571fa2f37ad1bfd2');
if (!is_admin()) {
wp_deregister_script('jquery');
wp_register_script('jquery', '', '', '1.8.2', true);
wp_register_script('jquery', '', '', '1.8.3', false);
}
if (is_single() && comments_open() && get_option('thread_comments')) {
wp_enqueue_script('comment-reply');
}
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '1c980f08acbf77c4709bea189d843756', true);
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'c40d165aabf0bf4734675f9fc726f3e6', true);
wp_enqueue_script('roots_scripts');
}