Merge branch 'develop' into fix/outer/advanced-color-palette

inc/vk-blocks/languages/vk-blocks-ja.po

@@ -427,13 +427,10 @@ msgstr "背景設定"
 msgid "Color Setting"
 msgstr "色設定"
 
-#: src/blocks/_pro/outer/edit.js:188 src/blocks/_pro/slider-item/edit.js:131
-msgid ""
-"Color will overcome background image. If you want to display image, clear "
-"background color or set opacity 0."
-msgstr ""
-"色を指定すると画像よりも優先されます。画像を表示したい場合は、背景色をクリア"
-"するか、不透明度を0に設定します。"
+#: src/blocks/_pro/outer/edit.js:188
+#: src/blocks/_pro/slider-item/edit.js:165
+msgid "Color will overcome background image. If you want to display image, set opacity 0."
+msgstr "色を指定すると画像よりも優先されます。画像を表示したい場合は、不透明度を0に設定します。"
 
 #: src/blocks/_pro/outer/edit.js:201 src/blocks/_pro/slider-item/edit.js:144
 msgid "Opacity Setting"

inc/vk-blocks/languages/vk-blocks-js.pot

@@ -438,8 +438,8 @@ msgstr ""
 #: src/blocks/_pro/outer/edit.js:188
 #: src/blocks/_pro/slider-item/edit.js:165
 msgid ""
-"Color will overcome background image. If you want to display image, clear "
-"background color or set opacity 0."
+"Color will overcome background image. If you want to display image, set "
+"opacity 0."
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:201

inc/vk-blocks/languages/vk-blocks.pot

@@ -2,16 +2,16 @@
 # This file is distributed under the same license as the VK Blocks Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: VK Blocks Pro 1.25.1\n"
+"Project-Id-Version: VK Blocks Pro 1.26.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vk-blocks-pro\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-02-24T05:28:47+00:00\n"
+"POT-Creation-Date: 2022-03-01T08:09:55+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.6.0\n"
+"X-Generator: WP-CLI 2.5.0\n"
 "X-Domain: vk-blocks\n"
 
 #: src/blocks/_pro/accordion/index.js:22
@@ -448,7 +448,7 @@ msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:188
 #: src/blocks/_pro/slider-item/edit.js:165
-msgid "Color will overcome background image. If you want to display image, clear background color or set opacity 0."
+msgid "Color will overcome background image. If you want to display image, set opacity 0."
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:201
@@ -2343,10 +2343,15 @@ msgstr ""
 msgid "Balloon Block Setting"
 msgstr ""
 
-#: inc/vk-blocks/admin/admin.php:125
+#: inc/vk-blocks/admin/admin.php:129
 msgid "Setting"
 msgstr ""
 
+#: inc/vk-blocks/build/blocks/page-content/index.php:118
+#: src/blocks/page-content/index.php:118
+msgid "Edit this area"
+msgstr ""
+
 #: inc/vk-blocks/view/class-vk-blocks-postlist.php:219
 msgid "No Post is selected"
 msgstr ""
@@ -2457,10 +2462,6 @@ msgstr ""
 msgid "If you choose \"Active Preload CSS\" that css load timing was changed.If you have any do not want to preload css file that please fill in handle(id) name. Ex) pluginname_a-style,pluginname_b-css"
 msgstr ""
 
-#: src/blocks/page-content/index.php:118
-msgid "Edit this area"
-msgstr ""
-
 #: vk-blocks.php:99
 msgid "Disabled Blocks module on VK All in One Expansion Unit. Because VK-Blocks Plugin running."
 msgstr ""

readme.txt

@@ -4,7 +4,7 @@ Donate link:
 Tags: Gutenberg,FAQ,alert
 Requires at least: 5.8
 Tested up to: 5.9.0
-Stable tag: 1.26.0
+Stable tag: 1.26.2
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -63,8 +63,14 @@ e.g.
 
 == Changelog ==
 
+
 [ Bug fix ][ Outer(Pro) ] cope with custom color palette
 
+= 1.26.2 =
+[ Other ] Rerelease
+
+[ Bugfix ][ Spacer ] fix spacer
+
 = 1.26.0 =
 [ fix ] fix plugin settings links.
 [ Add function ][ Spacer ] Add margin-top mode

src/blocks/_pro/outer/edit.js

@@ -239,7 +239,7 @@ export default function OuterEdit(props) {
 						id={`vk_outer-colorSetting`}
 						label={__('Color Setting', 'vk-blocks')}
 						help={__(
-							'Color will overcome background image. If you want to display image, clear background color or set opacity 0.',
+							'Color will overcome background image. If you want to display image, set opacity 0.',
 							'vk-blocks'
 						)}
 					>

src/blocks/_pro/slider-item/edit.js

@@ -163,7 +163,7 @@ export default function SliderItemEdit(props) {
 						label={__('Color Setting', 'vk-blocks')}
 						id={`vk_sliderItem-colorSetting`}
 						help={__(
-							'Color will overcome background image. If you want to display image, clear background color or set opacity 0.',
+							'Color will overcome background image. If you want to display image, set opacity 0.',
 							'vk-blocks'
 						)}
 					>

src/utils/common.scss

@@ -16,6 +16,7 @@
 }
 .vk_block{
 	&-margin-sm {
+		margin-top: var(--vk-margin-sm); /* 旧バージョンでdeprecatedが走ってない状態のfallback */
 		&--margin-top {
 			margin-top: var(--vk-margin-sm);
 		}
@@ -27,6 +28,7 @@
 		}
 	}
 	&-margin-md {
+		margin-top: var(--vk-margin-md); /* 旧バージョンでdeprecatedが走ってない状態のfallback */
 		&--margin-top {
 			margin-top: var(--vk-margin-md);
 		}
@@ -38,6 +40,7 @@
 		}
 	}
 	&-margin-lg {
+		margin-top: var(--vk-margin-lg); /* 旧バージョンでdeprecatedが走ってない状態のfallback */
 		&--margin-top {
 			margin-top: var(--vk-margin-lg);
 		}

vk-blocks.php

@@ -3,8 +3,8 @@
  * Plugin Name: VK Blocks Pro
  * Plugin URI: https://github.com/vektor-inc/vk-blocks
  * Description: This is a plugin that extends Gutenberg's blocks.
- * Version: 1.26.0
- * Stable tag: 1.26.0
+ * Version: 1.26.2
+ * Stable tag: 1.26.2
  * Requires at least: 5.8
  * Author: Vektor,Inc.
  * Author URI: https://vektor-inc.co.jp