Merge branch 'develop' into fix/tab/katawara

vektor-inc · Jul 11, 2024 · 2339e2c · 2339e2c
2 parents 5d34826 + ba16668
commit 2339e2c
Show file tree

Hide file tree

Showing 63 changed files with 7,065 additions and 2,205 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -3,14 +3,14 @@ module.exports = ( api ) => {
 
 	return {
 		presets: [
-			['@babel/preset-env', {
-			  "modules": "commonjs"
-			}],
+			['@babel/preset-env'],
 			'@wordpress/babel-preset-default'
 		  ],
 		plugins: [
 			'@emotion/babel-plugin',
-			'babel-plugin-inline-json-import'
-		 ],
+			'babel-plugin-inline-json-import',
+			"@babel/plugin-transform-async-to-generator",
+			"@babel/plugin-transform-regenerator"
+		],
 	};
 };
diff --git a/editor-css/_editor_before_slider.scss b/editor-css/_editor_before_slider.scss
@@ -8,6 +8,11 @@
 		max-width: 100vw;
 		.vk_slider_item {
 			max-width: 100vw;
+		}
+	}
+	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignwide,
+	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignfull {
+		.vk_slider_item {
 			&.vk_slider_item-paddingLR-use,
 			&.vk_slider_item-paddingLR-zero{
 				.vk_slider_item_container{
@@ -20,8 +25,3 @@
 		}
 	}
 }
-// インサーターが左右左右中央にならないので補正
-vk_slider>.vk_slider_wrapper>div>.block-editor-inner-blocks>.block-editor-block-list__layout>.block-list-appender {
-	margin-left:auto;
-	margin-right:auto;
-}
diff --git a/languages/vk-blocks-pro-ja-vk-blocks-admin-js.json b/languages/vk-blocks-pro-ja-vk-blocks-admin-js.json
diff --git a/languages/vk-blocks-pro-ja-vk-blocks-build-js.json b/languages/vk-blocks-pro-ja-vk-blocks-build-js.json
diff --git a/languages/vk-blocks-pro-ja.l10n.php b/languages/vk-blocks-pro-ja.l10n.php
diff --git a/languages/vk-blocks-pro-ja.mo b/languages/vk-blocks-pro-ja.mo
diff --git a/languages/vk-blocks-pro-ja.po b/languages/vk-blocks-pro-ja.po
@@ -1538,7 +1538,7 @@ msgid "Border Width"
 msgstr "線の幅"
 
 #: src/blocks/_pro/gridcolcard/edit-common.js:209
-#: src/blocks/border-box/edit.js:239 src/extensions/core/group/style.js:46
+#: src/blocks/border-box/edit.js:239 src/extensions/core/group/style.js:94
 msgid "Border Color"
 msgstr "線の色"
 
@@ -2585,6 +2585,14 @@ msgstr "枠線 ピン角"
 msgid "Border Rounded"
 msgstr "枠線 角丸"
 
+#: src/blocks/faq2-a/save.js:9
+msgid "Answer"
+msgstr "回答"
+
+#: src/blocks/faq2-q/save.js:9
+msgid "Question"
+msgstr "質問"
+
 #: src/blocks/faq2/edit.js:38
 msgid "Use common settings"
 msgstr "共通設定を使用"
@@ -3555,7 +3563,11 @@ msgstr "カラムの方向"
 msgid "Reverse"
 msgstr "逆"
 
-#: src/extensions/core/group/style.js:51
+#: src/extensions/core/group/style.js:181
+msgid "Group link"
+msgstr "グループリンク"
+
+#: src/extensions/core/group/style.js:99
 msgid ""
 "Because of the theme that enabled theme.json become can specify the color "
 "from border panel that, specification from here is deprecated."

diff --git a/languages/vk-blocks-pro-js.pot b/languages/vk-blocks-pro-js.pot
@@ -1533,7 +1533,7 @@ msgstr ""
 
 #: src/blocks/_pro/gridcolcard/edit-common.js:209
 #: src/blocks/border-box/edit.js:239
-#: src/extensions/core/group/style.js:46
+#: src/extensions/core/group/style.js:94
 msgid "Border Color"
 msgstr ""
 
@@ -2593,6 +2593,16 @@ msgstr ""
 msgid "Border Rounded"
 msgstr ""
 
+#: src/blocks/faq/save.js:16
+#: src/blocks/faq2-q/save.js:9
+msgid "Question"
+msgstr ""
+
+#: src/blocks/faq/save.js:20
+#: src/blocks/faq2-a/save.js:9
+msgid "Answer"
+msgstr ""
+
 #: src/blocks/faq2/edit.js:38
 msgid "Use common settings"
 msgstr ""
@@ -3537,7 +3547,11 @@ msgstr ""
 msgid "Reverse"
 msgstr ""
 
-#: src/extensions/core/group/style.js:51
+#: src/extensions/core/group/style.js:181
+msgid "Group link"
+msgstr ""
+
+#: src/extensions/core/group/style.js:99
 msgid ""
 "Because of the theme that enabled theme.json become can specify the color "
 "from border panel that, specification from here is deprecated."

diff --git a/languages/vk-blocks-pro.l10n.php b/languages/vk-blocks-pro.l10n.php