Merge branch 'develop' into feature/accordion/editor-js

# Conflicts: # readme.txt
vektor-inc · Oct 24, 2024 · c822f36 · c822f36
2 parents 8415004 + 6c3292e
commit c822f36
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/languages/vk-blocks-pro-js.pot b/languages/vk-blocks-pro-js.pot
@@ -3669,7 +3669,7 @@ msgid ""
 "from border panel that, specification from here is deprecated."
 msgstr ""
 
-#: src/extensions/core/group/style.js:191
+#: src/extensions/core/group/style.js:192
 msgid "Group link"
 msgstr ""
 

diff --git a/languages/vk-blocks-pro.pot b/languages/vk-blocks-pro.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the VK Blocks Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: VK Blocks Pro 1.87.0.0\n"
+"Project-Id-Version: VK Blocks Pro 1.88.0.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: 2024-10-21T14:55:12+00:00\n"
+"POT-Creation-Date: 2024-10-24T08:37:11+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: vk-blocks-pro\n"
@@ -3647,7 +3647,7 @@ msgstr ""
 msgid "Because of the theme that enabled theme.json become can specify the color from border panel that, specification from here is deprecated."
 msgstr ""
 
-#: src/extensions/core/group/style.js:191
+#: src/extensions/core/group/style.js:192
 msgid "Group link"
 msgstr ""
 

diff --git a/readme.txt b/readme.txt
@@ -106,7 +106,9 @@ e.g.
 
 == Changelog ==
 
-[ Add function ] [ Accordion (Pro) ] Added the ability to toggle the Accordion block open and close in the editing screen.
+[ Add function ][ Accordion (Pro) ] Added the ability to toggle the Accordion block open and close in the editing screen.
+[ Bug Fix ][ Grid Column Card (Pro) ] Fixed slider overflow in Grid Column Card Item Body.
+[ Bug fix ][ core/roup ] Fixed an issue where unwanted classes were assigned when links were present in the group block.
 
 = 1.88.0 =
 [ Specification change ][ Grid Column Card (Pro) ] Changed the default settings of headerDisplay and footerDisplay from "Delete" to "Display".

diff --git a/src/blocks/_pro/gridcolcard/style.scss b/src/blocks/_pro/gridcolcard/style.scss
@@ -52,6 +52,10 @@
 			&-valign-bottom{
 				align-content: end;
 			}
+			> .swiper{ //スライダーがはみ出すため打消し用
+				margin-left: unset;
+				margin-right: unset
+			}
 		}
 		&_footer{
 			display: grid;
@@ -74,4 +78,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/src/extensions/core/group/style.js b/src/extensions/core/group/style.js
@@ -183,6 +183,7 @@ const save = (props) => {
 
 	return (
 		<CustomTag {...blockProps}>
+			<InnerBlocks.Content />
 			{linkUrl && (
 				<a
 					href={linkUrl}
@@ -192,7 +193,6 @@ const save = (props) => {
 					className={`${prefix}-vk-link`}
 				></a>
 			)}
-			<InnerBlocks.Content />
 		</CustomTag>
 	);
 };