Merge branch 'develop'

Author: erwstout

CHANGELOG.md

@@ -2,14 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.4.3] - 2017-03-27
+# Removes
+- Removes jQuery enqueue from google CDN from issue #100. Thanks for the heads up @jeremyescott 
+
 ## [3.4.2] - 2017-03-21
 # Removes
 - Removes opinionated structures from template files.
 - Removes WP tweaks that were causing deprecation issues.
 
 # Adds
 - Adds sugar mixins for rems and aspect ratio
-- Adds Yelp CSS for social menu 
+- Adds Yelp CSS for social menu
 
 
 ## [3.4.1] - 2016-12-19

inc/enqueues.php

@@ -1,25 +1,13 @@
 <?php // CSS & JavaScript Enqueues
 
-/**
- * Load jQuery
-*/
-
-if ( !is_admin() ) {
-  add_action('wp_enqueue_scripts',function() {
-    wp_deregister_script('jquery');
-    wp_register_script('jquery', ('https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js'), false);
-    wp_enqueue_script('jquery');
-  });
-}
-
 /**
  * Defer jQuery Parsing using the HTML5 defer property
  */
 
 if (!(is_admin() )) {
   function defer_parsing_of_js ( $url ) {
     if ( FALSE === strpos( $url, '.js' ) ) return $url;
-    if ( strpos( $url, 'jquery.min.js' ) ) return $url;
+    if ( strpos( $url, 'jquery.js' ) ) return $url;
     // return "$url' defer ";
     return "$url' defer onload='";
   }
@@ -34,6 +22,6 @@ function prelude_theme_scripts() {
   wp_enqueue_style('prelude-css', get_template_directory_uri() . '/assets/css/theme.min.css', array(), THEME_VERSION );
 
   // JS
-  wp_enqueue_script('prelude-js', get_template_directory_uri() . '/assets/js/theme.min.js', array(), THEME_VERSION, true );
+  wp_enqueue_script('prelude-js', get_template_directory_uri() . '/assets/js/theme.min.js', array('jquery'), THEME_VERSION, true );
 }
 add_action( 'wp_enqueue_scripts', 'prelude_theme_scripts' );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prelude-wp",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "Prelude is a Wordpress starter theme that helps you craft custom themes. It uses Gulp to compile and minify scss/css, concatenate and minify JS, compress images, and more.",
   "main": "index.php",
   "scripts": {