resolve conflicts

dist/blocks.build.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '5976fc4ce0d71acb1d58');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '6e33db2b7ebf3239e69d');

dist/blocks.build.js

@@ -81002,6 +81002,7 @@ function StyledListItem(props) {
       return (0,_wordpress_blocks__WEBPACK_IMPORTED_MODULE_3__.createBlock)("ub/styled-list-item", {
         filteredAttributes: filteredAttributes,
         blockID: "",
+        selectedIcon: selectedIcon,
         itemText: itemFragment
       });
     },

readme.txt

@@ -154,6 +154,8 @@ That's it. You're done!
 
 * FIX: Aspect Ratio not working on uploaded video in advanced video block.
 * FIX: Content Toggle not working properly.
+* FIX: Howto step image height showing incorrectly.
+* FIX: Styled List Item icon change to default on add new item by pressing enter.
 
 = 3.1.9 =
 

src/blocks/how-to/style.scss

@@ -1,6 +1,7 @@
 .ub_howto-step-image,
 .ub_howto-yield-image {
 	width: 100%;
+	height: auto;
 }
 
 .ub_howto-supplies-list,

src/blocks/styled-list/components.js

@@ -954,6 +954,7 @@ export function StyledListItem(props) {
 					return createBlock("ub/styled-list-item", {
 						filteredAttributes,
 						blockID: "",
+						selectedIcon: selectedIcon,
 						itemText: itemFragment,
 					});
 				}}

src/blocks/styled-list/style-list-item/block.json

@@ -1,50 +1,50 @@
 {
-     "$schema": "https://schemas.wp.org/trunk/block.json",
-     "apiVersion": 3,
-     "name": "ub/styled-list-item",
-     "title": "Styled List Item",
-     "category": "ultimateblocks",
-     "description": "This block lets you add a styled list in your post or pages. Instead of bullets you can use various icons as your list style type. ",
-     "keywords": [
-          "List",
-          "Styled List",
-          "Ultimate Blocks"
-     ],
-     "attributes": {
-          "blockID": {
-               "type": "string",
-               "default": ""
-          },
-          "itemText": {
-               "type": "string",
-               "default": ""
-          },
-          "selectedIcon": {
-               "type": "string",
-               "default": "check"
-          },
-          "iconColor": {
-               "type": "string",
-               "default": "#000000"
-          },
-          "iconSize": {
-               "type": "number",
-               "default": 5
-          },
-          "fontSize": {
-               "type": "number",
-               "default": 0
-          },
-          "padding": {
-               "type": "object",
-               "default": {}
-          },
-          "margin": {
-               "type": "object",
-               "default": {}
-          }
-     },
-     "supports": {
-          "inserter": false
-     }
-}
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "ub/styled-list-item",
+	"title": "Styled List Item",
+	"category": "ultimateblocks",
+	"description": "This block lets you add a styled list in your post or pages. Instead of bullets you can use various icons as your list style type. ",
+	"keywords": [
+		"List",
+		"Styled List",
+		"Ultimate Blocks"
+	],
+	"attributes": {
+		"blockID": {
+			"type": "string",
+			"default": ""
+		},
+		"itemText": {
+			"type": "string",
+			"default": ""
+		},
+		"selectedIcon": {
+			"type": "string",
+			"default": "check"
+		},
+		"iconColor": {
+			"type": "string",
+			"default": "#000000"
+		},
+		"iconSize": {
+			"type": "number",
+			"default": 5
+		},
+		"fontSize": {
+			"type": "number",
+			"default": 0
+		},
+		"padding": {
+			"type": "object",
+			"default": {}
+		},
+		"margin": {
+			"type": "object",
+			"default": {}
+		}
+	},
+	"supports": {
+		"inserter": false
+	}
+}

vendor/composer/installed.php

@@ -1,9 +1,15 @@
 <?php return array(
     'root' => array(
         'name' => 'ultimate-blocks/ultimate-blocks',
+<<<<<<< HEAD
         'pretty_version' => 'dev-v3_2_0',
         'version' => 'dev-v3_2_0',
         'reference' => '585efc00c5bd16093db33f597b75b2f89a9225b8',
+=======
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'reference' => '6b1200ba78c3259969de03b6957b8967639746a5',
+>>>>>>> master
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -56,9 +62,15 @@
             'dev_requirement' => false,
         ),
         'ultimate-blocks/ultimate-blocks' => array(
+<<<<<<< HEAD
             'pretty_version' => 'dev-v3_2_0',
             'version' => 'dev-v3_2_0',
             'reference' => '585efc00c5bd16093db33f597b75b2f89a9225b8',
+=======
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => '6b1200ba78c3259969de03b6957b8967639746a5',
+>>>>>>> master
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

zip/info.json

@@ -1,6 +1,12 @@
 {
   "version": "3.2.0-dev",
+<<<<<<< HEAD
   "mode": "development",
   "size": "7.55mb",
   "date": "2024-06-25T09:38:37.208Z"
+=======
+  "mode": "production",
+  "size": "7.17mb",
+  "date": "2024-06-25T07:09:02.841Z"
+>>>>>>> master
 }