Merge pull request #1260 from derweili/master

use get_stylesheet_directory_uri to support usage as childtheme
olefredrik · Apr 1, 2018 · 296fed5 · 296fed5
2 parents 249b49f + e0d1450
commit 296fed5
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 56 deletions.
diff --git a/library/enqueue-scripts.php b/library/enqueue-scripts.php
@@ -37,7 +37,7 @@ function foundationpress_asset_path( $filename ) {
 	function foundationpress_scripts() {
 
 		// Enqueue the main Stylesheet.
-		wp_enqueue_style( 'main-stylesheet', get_template_directory_uri() . '/dist/assets/css/' . foundationpress_asset_path( 'app.css' ), array(), '2.10.4', 'all' );
+		wp_enqueue_style( 'main-stylesheet', get_stylesheet_directory_uri() . '/dist/assets/css/' . foundationpress_asset_path( 'app.css' ), array(), '2.10.4', 'all' );
 
 		// Deregister the jquery version bundled with WordPress.
 		wp_deregister_script( 'jquery' );
@@ -55,7 +55,7 @@ function foundationpress_scripts() {
 		// wp_enqueue_script( 'jquery-migrate' );
 
 		// Enqueue Foundation scripts
-		wp_enqueue_script( 'foundation', get_template_directory_uri() . '/dist/assets/js/' . foundationpress_asset_path( 'app.js' ), array( 'jquery' ), '2.10.4', true );
+		wp_enqueue_script( 'foundation', get_stylesheet_directory_uri() . '/dist/assets/js/' . foundationpress_asset_path( 'app.js' ), array( 'jquery' ), '2.10.4', true );
 
 		// Enqueue FontAwesome from CDN. Uncomment the line below if you need FontAwesome.
 		//wp_enqueue_script( 'fontawesome', 'https://use.fontawesome.com/5016a31c8c.js', array(), '4.7.0', true );

diff --git a/package-lock.json b/package-lock.json