Merge pull request #103 from washingtonstateuniversity/1.x

Fix editor style loading

CHANGELOG.md

@@ -18,6 +18,12 @@ This document details all notable changes to the WSU HRS Child Theme. Uses [Sema
 ### Removed (for deprecated features removed in this release)
 -->
 
+## 1.3.1 (2019-04-12)
+
+### Fixed
+
+- Fix #100 Use local path for `add_editor_style` to load styles more reliably.
+
 ## 1.3.0 (2019-04-10)
 
 ### Fixed

README.md

@@ -6,7 +6,7 @@
 **Requires at least:** WordPress 4.7  
 **Tested up to:** WordPress 5.2.0  
 **Requires PHP:** 5.6  
-**Version:** 1.2.0  
+**Version:** 1.3.1  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 

includes/class-hrs-theme-setup.php

@@ -57,7 +57,6 @@ public function setup_hooks() {
 		add_action( 'init', array( $this, 'register_taxonomies' ), 0 );
 		add_action( 'init', array( $this, 'register_blocks' ) );
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_block_editor_scripts' ) );
-		add_action( 'admin_init', array( $this, 'enqueue_editor_style' ) );
 		add_action( 'customize_register', array( $this, 'remove_custom_css_control' ) );
 
 		// Set Spine options.
@@ -236,6 +235,7 @@ public function add_theme_support() {
 		add_theme_support( 'align-wide' );
 		add_theme_support( 'responsive-embeds' );
 		add_theme_support( 'editor-styles' );
+		add_editor_style( '/assets/css/editor-style.css' );
 
 		// Disables some custom Gutenberg block options.
 		add_theme_support( 'disable-custom-colors' );
@@ -478,15 +478,6 @@ public function enqueue_block_editor_scripts() {
 		);
 	}
 
-	/**
-	 * Enqueues the editor style.
-	 *
-	 * @since 1.1.0
-	 */
-	public function enqueue_editor_style() {
-		add_editor_style( get_stylesheet_directory_uri() . '/assets/css/editor-style.css' );
-	}
-
 	/**
 	 * Filters the Spine page title contents.
 	 *

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hrs.wsu.edu",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/washingtonstateuniversity/hrs.wsu.edu"

src/scss/style.scss

@@ -5,7 +5,7 @@ Author: Adam Turner, WSU University Communications
 Author URI: https://web.wsu.edu/
 Description: A child theme of the WSU Web Communications Spine template.
 Template: wsuspine
-Version: 1.3.0
+Version: 1.3.1
 Requires at least: 4.7
 Tested up to: 5.2.0
 Requires PHP: 5.6

style.css

@@ -5,7 +5,7 @@ Author: Adam Turner, WSU University Communications
 Author URI: https://web.wsu.edu/
 Description: A child theme of the WSU Web Communications Spine template.
 Template: wsuspine
-Version: 1.3.0
+Version: 1.3.1
 Requires at least: 4.7
 Tested up to: 5.2.0
 Requires PHP: 5.6