Merge branch 'release-1.1.2'

.editorconfig

@@ -14,6 +14,13 @@ trim_trailing_whitespace = true
 indent_style = tab
 indent_size = 2
 
-[{.jshintrc,*.json,*.yml}]
+[{package.json,*.yml}]
 indent_style = space
 indent_size = 2
+
+[composer.json]
+indent_style = space
+indent_size = 4
+
+[*.js]
+indent_style = space

README.md

@@ -294,6 +294,11 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+### [1.1.2] - 2019.09.19
+
+- fix site-info
+- add editor-style.scss
+
 ### [1.1.1] - 2019.07.30
 
 - replace from uglifyjs to uglify-es

functions/setup/class-theme.php

@@ -128,7 +128,7 @@ public function setup() {
 		add_theme_support( 'editor-styles' );
 
 		// Enqueue editor styles.
-		add_editor_style( 'css/style-editor.css' );
+		add_editor_style( 'css/editor-style.css' );
 
 		// Adding support for core block visual styles.
 		add_theme_support( 'wp-block-styles' );

functions/theme-hook/class-theme-hook.php

@@ -21,7 +21,7 @@ public function __construct() {
 		add_action( 'wp_theme_boilerplate/theme_hook/site/header', array( $this, 'header' ) );
 		add_action( 'wp_theme_boilerplate/theme_hook/site/header/after', array( $this, 'global_navi' ) );
 		add_action( 'wp_theme_boilerplate/theme_hook/site/header/after', array( $this, 'header_image' ) );
-		add_action( 'wp_theme_boilerplate/theme_hook/site/footer', array( $this, 'site_info' ) );
+		add_action( 'wp_theme_boilerplate/theme_hook/site/footer/after', array( $this, 'site_info' ) );
 
 		add_action( 'wp_theme_boilerplate/theme_hook/entry/post_thumbnail', array( $this, 'post_thumbnail' ) );
 		add_action( 'wp_theme_boilerplate/theme_hook/entry/meta/header', array( $this, 'entry_meta_header' ) );