Merge master, update to Bootstrap 2.2.1

This commit is contained in:
Ben Word
2012-11-01 09:28:34 -05:00
22 changed files with 40 additions and 38 deletions

View File

@@ -12,7 +12,7 @@
*/
function roots_scripts() {
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'f60c3bb06fe0e1fcf0f63cd76a4ec7c9');
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'a66feb69f8e39965cd2a11e48a1448a6');
if (!is_admin()) {
wp_deregister_script('jquery');
@@ -23,7 +23,7 @@ function roots_scripts() {
wp_enqueue_script('comment-reply');
}
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'f7de8c348d616069f4e6132e96518067', true);
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '1c980f08acbf77c4709bea189d843756', true);
wp_enqueue_script('roots_scripts');
}