fix: rtlcss loading for Header Grid and WooCommerce

Codeinwp · Jun 19, 2019 · a0fc0e2 · a0fc0e2
1 parent 0a9a022
commit a0fc0e2
Show file tree

Hide file tree

Showing 8 changed files with 1,135 additions and 117 deletions.
diff --git a/grunt/cssmin.js b/grunt/cssmin.js
@@ -8,9 +8,11 @@ module.exports = {
 	},
 	customizerStyle: {
 		files: {
-			'assets/css/customizer-style.min.css': [ 'assets/css/customizer-style.css' ],
-			'assets/css/customizer-style-rtl.min.css': [ 'assets/css/customizer-style-rtl.css' ],
-			'style-rtl.min.css': [ 'style-rtl.css' ]
+			'assets/css/customizer-style.min.css': ['assets/css/customizer-style.css'],
+			'assets/css/customizer-style-rtl.min.css': ['assets/css/customizer-style-rtl.css'],
+			'style-rtl.min.css': ['style-rtl.css'],
+			'header-footer-grid/assets/css/style-rtl.min.css': ['header-footer-grid/assets/css/style-rtl.css'],
+			'header-footer-grid/assets/css/style.min.css': ['header-footer-grid/assets/css/style.css']
 		}
 	}
 };
diff --git a/grunt/rtlcss.js b/grunt/rtlcss.js
@@ -1,118 +1,69 @@
 /* jshint node:true */
 // https://github.com/MohammadYounes/grunt-rtlcss
-module.exports = {
-	style: {
-		// task options
-		options: {
-			'autoRename': false,
-			'autoRenameStrict': false,
-			'blacklist':{},
-			'clean': true,
-			'greedy': false,
-			'processUrls': false,
-			'stringMap': [
-				{
-					'name'    : 'left-right',
-					'priority': 100,
-					'search'  : ['left', 'Left', 'LEFT'],
-					'replace' : ['right', 'Right', 'RIGHT'],
-					'options' : {
-						'scope' : '*',
-						'ignoreCase' : false
-					}
-			},
-				{
-					'name'    : 'ltr-rtl',
-					'priority': 100,
-					'search'  : ['ltr', 'Ltr', 'LTR'],
-					'replace' : ['rtl', 'Rtl', 'RTL'],
-					'options' :	{
-						'scope' : '*',
-						'ignoreCase' : false
-					}
+
+const ext = '-rtl.css';
+const options = {
+	'autoRename': false,
+	'autoRenameStrict': false,
+	'blacklist': {},
+	'clean': true,
+	'greedy': false,
+	'processUrls': false,
+	'stringMap': [
+		{
+			'name': 'left-right',
+			'priority': 100,
+			'search': ['left', 'Left', 'LEFT'],
+			'replace': ['right', 'Right', 'RIGHT'],
+			'options': {
+				'scope': '*',
+				'ignoreCase': false
 			}
-			]
 		},
-		expand : true,
-		cwd    : './',
-		dest   : './',
-		ext   : '-rtl.css',
-		src    : ['style.css']
+		{
+			'name': 'ltr-rtl',
+			'priority': 100,
+			'search': ['ltr', 'Ltr', 'LTR'],
+			'replace': ['rtl', 'Rtl', 'RTL'],
+			'options': {
+				'scope': '*',
+				'ignoreCase': false
+			}
+		}
+	]
+};
+
+module.exports = {
+	style: {
+		options,
+		expand: true,
+		cwd: './',
+		dest: './',
+		ext,
+		src: ['style.css']
 	},
 	woocommerce: {
-		// task options
-		options: {
-			'autoRename': false,
-			'autoRenameStrict': false,
-			'blacklist':{},
-			'clean': true,
-			'greedy': false,
-			'processUrls': false,
-			'stringMap': [
-				{
-					'name'    : 'left-right',
-					'priority': 100,
-					'search'  : ['left', 'Left', 'LEFT'],
-					'replace' : ['right', 'Right', 'RIGHT'],
-					'options' : {
-						'scope' : '*',
-						'ignoreCase' : false
-					}
-			},
-				{
-					'name'    : 'ltr-rtl',
-					'priority': 100,
-					'search'  : ['ltr', 'Ltr', 'LTR'],
-					'replace' : ['rtl', 'Rtl', 'RTL'],
-					'options' :	{
-						'scope' : '*',
-						'ignoreCase' : false
-					}
-			}
-			]
-		},
-		expand : true,
-		cwd    : './assets/css/',
-		dest   : './assets/css/',
-		ext   : '-rtl.css',
-		src    : ['woocommerce.css']
+		options,
+		expand: true,
+		cwd: './assets/css/',
+		dest: './assets/css/',
+		ext,
+		src: ['woocommerce.css']
 	},
 	customizerStyle: {
-		// task options
-		options: {
-			'autoRename': false,
-			'autoRenameStrict': false,
-			'blacklist':{},
-			'clean': true,
-			'greedy': false,
-			'processUrls': false,
-			'stringMap': [
-				{
-					'name'    : 'left-right',
-					'priority': 100,
-					'search'  : ['left', 'Left', 'LEFT'],
-					'replace' : ['right', 'Right', 'RIGHT'],
-					'options' : {
-						'scope' : '*',
-						'ignoreCase' : false
-					}
-			},
-				{
-					'name'    : 'ltr-rtl',
-					'priority': 100,
-					'search'  : ['ltr', 'Ltr', 'LTR'],
-					'replace' : ['rtl', 'Rtl', 'RTL'],
-					'options' :	{
-						'scope' : '*',
-						'ignoreCase' : false
-					}
-			}
-			]
-		},
-		expand : true,
-		cwd    : './assets/css/',
-		dest   : './assets/css/',
-		ext   : '-rtl.css',
-		src    : ['customizer-style.css']
+		options,
+		expand: true,
+		cwd: './assets/css/',
+		dest: './assets/css/',
+		ext,
+		src: ['customizer-style.css']
+	},
+	hfg: {
+		options,
+		expand: true,
+		cwd: './header-footer-grid/assets/css/',
+		dest: './header-footer-grid/assets/css/',
+		ext,
+		src: ['style.css']
 	},
 };
diff --git a/header-footer-grid/Main.php b/header-footer-grid/Main.php
@@ -174,7 +174,10 @@ public function get_templates_location() {
 	 */
 	public function enqueue_scripts() {
 		$suffix = $this->get_assets_suffix();
-		wp_enqueue_style( 'hfg-style', esc_url( Config::get_url() ) . '/assets/css/style' . $suffix . '.css', array(), self::VERSION );
+		wp_register_style( 'hfg-style', esc_url( Config::get_url() ) . '/assets/css/style.min.css', array(), self::VERSION );
+		wp_style_add_data( 'hfg-style', 'rtl', 'replace' );
+		wp_style_add_data( 'hfg-style', 'suffix', '.min' );
+		wp_enqueue_style( 'hfg-style' );
 
 		wp_enqueue_script(
 			'hfg-theme-functions',

diff --git a/header-footer-grid/assets/css/admin/customizer/customizer.min.css b/header-footer-grid/assets/css/admin/customizer/customizer.min.css