Merge branch 'develop'

README.txt

@@ -3,11 +3,11 @@ Contributors: getbowtied, vanesareinerth, adrianlbs
 Tags: gutenberg, blocks
 Requires at least: 5.0
 Tested up to: 5.0.3
-Stable tag: 1.2
+Stable tag: 1.2.1
 Requires PHP: 5.5.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-~Current Version:1.2~
+~Current Version:1.2.1~
 
 Extends the functionality of the The Retailer theme by adding theme specific features.
 
@@ -24,6 +24,9 @@ Companion plugin for the **The Retailer** theme. Extends the functionality by ad
 
 == Changelog ==
 
+= 1.2.1 =
+- Fixed: Columns Block displaying issue
+
 = 1.2 =
 - WordPress 5+ compatibility improvements
 - Improved styles for theme neutrality

updater/assets/plugin.json → core/updater/assets/plugin.json

@@ -1,28 +1,28 @@
 {
 	"name": "The Retailer Extender",
-	"version": "1.2",
+	"version": "1.2.1",
 	"download_url": "https://github.com/getbowtied/the-retailer-extender/zipball/master",
 
 	"homepage": "https://themeforest.net/item/the-retailer-responsive-wordpress-theme/4287447",
 	"requires": "5.0",
 	"tested": "5.0.3",
-	"last_updated": "2019-01-18 10:00:00",
+	"last_updated": "2019-02-04 12:00:00",
 
 	"author": "GetBowtied",
 	"author_homepage": "https://getbowtied.com/",
 
 	"sections": {
 		"description": "<p>Companion plugin for the <b>The Retailer</b> theme. Extends the functionality by adding theme specific features.</p><h4>Gutenberg Blocks:</h4><ul><li>Image Slider</li><li>Banner</li><li>Posts Grid</li><li>Social Media Profiles</li><li>Portfolio</li></ul>",
-		"changelog": "<h4>1.2</h4><ul><li>WordPress 5+ compatibility improvements</li><li>Improved styles for theme neutrality</li> <li>Localization issues with the Posts Grid Block</li></ul><h4>1.1</h4><ul><li>WordPress 5+ compatibility improvements</li></ul><h4>1.0</h4><ul><li>Initial Version</li></ul>"
+		"changelog": "<h4>1.2.1</h4><ul><li>Fixed: Columns Block displaying issue</li></ul><h4>1.2</h4><ul><li>WordPress 5+ compatibility improvements</li><li>Improved styles for theme neutrality</li> <li>Localization issues with the Posts Grid Block</li></ul><h4>1.1</h4><ul><li>WordPress 5+ compatibility improvements</li></ul><h4>1.0</h4><ul><li>Initial Version</li></ul>"
 	},
 
 	"icons" : {
-		"1x" : "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/updater/assets/images/theretailer-extender-128x128.png",
-		"2x" : "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/updater/assets/images/theretailer-extender-256x256.png"
+		"1x" : "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/core/updater/assets/images/theretailer-extender-128x128.png",
+		"2x" : "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/core/updater/assets/images/theretailer-extender-256x256.png"
     },
 
 	"banners": {
-		"low": "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/updater/assets/images/theretailer-banner-772x250.png",
-		"high": "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/updater/assets/images/theretailer-banner-1544x500.png"
+		"low": "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/core/updater/assets/images/theretailer-banner-772x250.png",
+		"high": "https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/core/updater/assets/images/theretailer-banner-1544x500.png"
 	}
 }

includes/gbt-blocks/assets/css/editor.css

@@ -229,7 +229,8 @@
     overflow-y: auto;
     overflow-x: hidden;
     margin-bottom: 20px;
-    padding-left: 3px; }
+    padding-left: 3px;
+    margin-top: 10px; }
     .main-inspector-wrapper .category-result-wrapper ul {
       list-style: none;
       margin: 0;

includes/gbt-blocks/assets/css/editor.scss

@@ -279,6 +279,7 @@
         overflow-x: hidden;
         margin-bottom: 20px;
         padding-left: 3px;
+        margin-top: 10px;
 
         ul {
             list-style: none;

includes/gbt-blocks/index.php

@@ -5,11 +5,13 @@
 //==============================================================================
 //	Main Editor Styles
 //==============================================================================
-wp_enqueue_style(
-	'getbowtied-tr-product-blocks-editor-styles',
-	plugins_url( 'assets/css/editor.css', __FILE__ ),
-	array( 'wp-edit-blocks' )
-);
+add_action( 'enqueue_block_editor_assets', function() {
+	wp_enqueue_style(
+		'getbowtied-tr-blocks-editor-styles',
+		plugins_url( 'assets/css/editor.css', __FILE__ ),
+		array( 'wp-edit-blocks' )
+	);
+});
 
 //==============================================================================
 //	Main JS
@@ -19,7 +21,7 @@
 	function getbowtied_tr_product_blocks_scripts() {
 
 		wp_enqueue_script(
-			'getbowtied-tr-product-blocks-editor-scripts',
+			'getbowtied-tr-blocks-editor-scripts',
 			plugins_url( 'assets/js/main.js', __FILE__ ),
 			array( 'wp-blocks', 'jquery' )
 		);

the-retailer-extender.php

@@ -4,7 +4,7 @@
  * Plugin Name:       		The Retailer Extender
  * Plugin URI:        		https://github.com/getbowtied/the-retailer-extender
  * Description:       		Extends the functionality of The Retailer with Gutenberg elements.
- * Version:           		1.2
+ * Version:           		1.2.1
  * Author:            		GetBowtied
  * Author URI:        		https://getbowtied.com
  * Requires at least: 		5.0
@@ -25,9 +25,9 @@
 global $theme;
 $theme = wp_get_theme();
 
-require 'updater/plugin-update-checker.php';
+require 'core/updater/plugin-update-checker.php';
 $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
-	'https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/updater/assets/plugin.json',
+	'https://raw.githubusercontent.com/getbowtied/the-retailer-extender/master/core/updater/assets/plugin.json',
 	__FILE__,
 	'the-retailer-extender'
 );
@@ -49,7 +49,7 @@ function tr_theme_warning() {
 
 		?>
 
-		<div class="message error woocommerce-admin-notice woocommerce-st-inactive woocommerce-not-configured">
+		<div class="error">
 			<p>The Retailer Extender plugin couldn't find the Block Editor (Gutenberg) on this site. It requires WordPress 5+ or Gutenberg installed as a plugin.</p>
 		</div>