Merge pull request #2438 from vektor-inc/develop

[ Change version ] 1.95.0
vektor-inc · Jan 31, 2025 · c5ea054 · c5ea054
2 parents 7ad3cdf + de0ff74
commit c5ea054
Show file tree

Hide file tree

Showing 48 changed files with 4,006 additions and 766 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -60,7 +60,7 @@ jobs:
         npx wp-scripts test-playwright --trace on --project=chromium common-margin.spec.ts
         npx wp-scripts test-playwright --trace on --project=chromium heading-transform.spec.ts
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: playwright-report

diff --git a/editor-css/_editor_before_grid-column.scss b/editor-css/_editor_before_grid-column.scss
@@ -12,14 +12,14 @@
 
 	//inner-blocksの中のinner-blocksのcss打ち消し
 	.block-editor-inner-blocks .block-editor-block-list__layout{
-		flex-direction:unset;
-		flex-wrap: unset;
 		&.wp-block-social-links, //inner-blocksの中のinner-blocksがソーシャルアイコンブロックだった場合
 		&.wp-block-group { //inner-blocksの中のinner-blocksがグループブロックだった場合
 			display: flex;
-			flex-direction: row;
 			flex-wrap: wrap;
 		}
+		&.wp-block-group:where(:not(.is-vertical)){ //垂直レイアウトの場合は除外したいため追加
+			flex-direction: row;
+		}
 	}
 
 	// colの余分な余白の削除など

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