Merge develop file

vektor-inc · Jul 16, 2024 · d609044 · d609044
2 parents 647d37a + f5441bf
commit d609044
Show file tree

Hide file tree

Showing 16 changed files with 4,293 additions and 7,475 deletions.
diff --git a/editor-css/_editor_before_outer.scss b/editor-css/_editor_before_outer.scss
@@ -4,39 +4,59 @@
 .vk_outer-width-full.vk_outer-paddingLR-use,
 .vk_outer-width-full.vk_outer-paddingLR-zero{
 	// コンテンツエリアをはみ出させる
-	.wp-block { max-width:100%; }
-}
-
-.is-sidebar-opened & .vk_outer-width-full.vk_outer-paddingLR-use,
-.is-sidebar-opened & .vk_outer-width-full.vk_outer-paddingLR-zero{
-	// サイドバー表示時に全幅要素がはみ出してサイドバーの下などに入り込むのを防止
-	margin-left: calc( 50% - 50vw + 140px );
-	margin-right: calc( 50% - 50vw + 140px );
-	// コンテンツエリアをはみ出させる
-	.wp-block { max-width:100%; }
+	.wp-block:where(:not( 
+		.alignfull,
+		.alignwide,
+		[data-align="wide"],
+		[data-align="full"] 
+	)) { 
+		max-width:100%; 
+		.is-layout-constrained {
+			width: var(--vk-width-container);
+			max-width: var(--vk-width-container);
+		}
+	}
 }
 
 .wp-block-vk-blocks-outer.vk_outer.vk_outer-width-full {
-	width: 100%;
-	max-width: 100vw;
+	width: var(--vk-width-full);
+	max-width: var(--vk-width-full);
 	margin-left: 0;
 	margin-right: 0;
 	padding-left: 0;
 	padding-right: 0;
 	&.vk_outer-paddingLR-use,
 	&.vk_outer-paddingLR-zero {
-		width: 100%;
-		max-width: 100vw;
-
-		padding-left: var(--padding-left);
-		padding-right: var(--padding-right);
-
+		padding-left: var(--vk-outer-padding);
+		padding-right: var(--vk-outer-padding);
 		.block-editor-inner-blocks {
-			max-width: 100vw;
+			max-width: var(--vk-width-full);
 		}
 	}
 	.block-editor-inner-blocks {
-		max-width: 1110px;
+		// max-width: 1110px;
 		margin: auto;
 	}
+	&.vk_outer-paddingLR-use {
+		[data-align=wide] {
+			width: calc( var(--vk-width-full) - var(--vk-outer-padding)  );
+			max-width: calc( var(--vk-width-full) - var(--vk-outer-padding)  );
+			margin-left: calc( var(--vk-outer-padding) / -2 );
+		}
+		[data-align=full] {
+			width: var(--vk-width-full);
+			max-width:  var(--vk-width-full);
+			margin-left: calc( var(--vk-outer-padding) * -1 );
+		}
+	}
+	&.vk_outer-paddingLR-none {
+		[data-align=wide] {
+			width: calc( var(--vk-width-container) + ( var(--vk-width-full) -  var(--vk-width-container) ) / 2 );
+			max-width: calc( var(--vk-width-container) + ( var(--vk-width-full) -  var(--vk-width-container) ) / 2 );
+			margin-left: calc( ( var(--vk-width-container) - var(--vk-width-full) ) / 4 );
+		}
+		[data-align=full] {
+			margin-left: calc( ( var(--vk-width-container) - var(--vk-width-full) ) / 2 );
+		}
+	}
 }
diff --git a/editor-css/_editor_before_slider.scss b/editor-css/_editor_before_slider.scss
@@ -1,18 +1,20 @@
 /*-------------------------------------------*/
 /* 管理画面
 /*-------------------------------------------*/
-.edit-post-visual-editor {
-	/* vk_width-full は廃止になったが互換処理のために 2022年7月末までは残す */
-	.vk_slider.vk_swiper.vk_slider.vk_swiper.vk_width-full,
-	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignfull {
-		max-width: 100vw;
-		.vk_slider_item {
-			max-width: 100vw;
-		}
+// .edit-post-visual-editor だとモバイルやタブレットの iframe で効かないので .editor-styles-wrapper で指定
+.editor-styles-wrapper{
+	.is-layout-constrained .vk_slider_item-background-area {
+		max-width: 100%; // コアが --wp--style--global--content-size つけてくるので打消し
 	}
-	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignwide,
-	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignfull {
+	.vk_slider.vk_swiper.alignwide,
+	.vk_slider.vk_swiper.alignfull {
 		.vk_slider_item {
+			max-width:100%;
+			// Lightning theme.json 有効時など コアが margin-block-start: 24px; つけてくるので打消し
+			.vk_slider_item-background-area,
+			.vk_slider_item_container{
+				margin-block-start: 0; // コアが margin-block-start: 24px; つけてくるので打消し
+			}
 			&.vk_slider_item-paddingLR-use,
 			&.vk_slider_item-paddingLR-zero{
 				.vk_slider_item_container{

diff --git a/editor-css/_variables.scss b/editor-css/_variables.scss
@@ -1,4 +1,5 @@
 :root {
+	--vk-width-full:100svw;
 	--vk-width-couter-col-3: 25%;
 	--vk-width-couter-col-4: 33.3%;
 	--vk-width-couter-col-6: 50%;

diff --git a/languages/vk-blocks-pro-js.pot b/languages/vk-blocks-pro-js.pot
@@ -1536,7 +1536,7 @@ msgstr ""
 
 #: src/blocks/_pro/gridcolcard/edit-common.js:209
 #: src/blocks/border-box/edit.js:239
-#: src/extensions/core/group/style.js:94
+#: src/extensions/core/group/style.js:99
 msgid "Border Color"
 msgstr ""
 
@@ -1654,12 +1654,6 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: src/blocks/_pro/outer/deprecated/save/1.78.0/save.js:252
-#: src/blocks/_pro/outer/edit.js:418
-#: src/blocks/_pro/outer/save.js:252
-msgid "Outer link"
-msgstr ""
-
 #: src/blocks/_pro/outer/edit.js:1018
 msgid "Min Height Setting"
 msgstr ""
@@ -1689,6 +1683,11 @@ msgstr ""
 msgid "dvh"
 msgstr ""
 
+#: src/blocks/_pro/outer/edit.js:418
+#: src/blocks/_pro/outer/save.js:252
+msgid "Outer link"
+msgstr ""
+
 #: src/blocks/_pro/outer/edit.js:424
 #: src/blocks/slider-item/edit.js:162
 msgid "Background Setting"
@@ -1902,10 +1901,6 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: src/blocks/_pro/post-category-badge/edit.js:72
-msgid "Not Set"
-msgstr ""
-
 #: src/blocks/_pro/post-category-badge/edit.js:86
 msgid "Setting"
 msgstr ""
@@ -1918,10 +1913,6 @@ msgstr ""
 msgid "Select Taxonomy"
 msgstr ""
 
-#: src/blocks/_pro/post-category-badge/variations.js:13
-msgid "Category Badge"
-msgstr ""
-
 #: src/blocks/_pro/post-list/edit.js:237
 #. Filter by %s
 msgid "Filter by %s"
@@ -3584,16 +3575,16 @@ msgstr ""
 msgid "Reverse"
 msgstr ""
 
-#: src/extensions/core/group/style.js:181
-msgid "Group link"
-msgstr ""
-
-#: src/extensions/core/group/style.js:99
+#: src/extensions/core/group/style.js:104
 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
+msgid "Group link"
+msgstr ""
+
 #: src/extensions/core/list/style.js:107
 msgid "List Icon Color"
 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.78.0.0\n"
+"Project-Id-Version: VK Blocks Pro 1.79.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-07-12T05:15:00+00:00\n"
+"POT-Creation-Date: 2024-07-16T08:01:20+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"
@@ -1526,7 +1526,7 @@ msgstr ""
 
 #: src/blocks/_pro/gridcolcard/edit-common.js:209
 #: src/blocks/border-box/edit.js:239
-#: src/extensions/core/group/style.js:94
+#: src/extensions/core/group/style.js:99
 msgid "Border Color"
 msgstr ""
 
@@ -1641,12 +1641,6 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: src/blocks/_pro/outer/deprecated/save/1.78.0/save.js:252
-#: src/blocks/_pro/outer/edit.js:418
-#: src/blocks/_pro/outer/save.js:252
-msgid "Outer link"
-msgstr ""
-
 #: src/blocks/_pro/outer/edit.js:1018
 msgid "Min Height Setting"
 msgstr ""
@@ -1676,6 +1670,11 @@ msgstr ""
 msgid "dvh"
 msgstr ""
 
+#: src/blocks/_pro/outer/edit.js:418
+#: src/blocks/_pro/outer/save.js:252
+msgid "Outer link"
+msgstr ""
+
 #: src/blocks/_pro/outer/edit.js:424
 #: src/blocks/slider-item/edit.js:162
 msgid "Background Setting"
@@ -1890,10 +1889,6 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: src/blocks/_pro/post-category-badge/edit.js:72
-msgid "Not Set"
-msgstr ""
-
 #: src/blocks/_pro/post-category-badge/edit.js:86
 #: inc/vk-blocks/admin/admin.php:135
 msgid "Setting"
@@ -1907,10 +1902,6 @@ msgstr ""
 msgid "Select Taxonomy"
 msgstr ""
 
-#: src/blocks/_pro/post-category-badge/variations.js:13
-msgid "Category Badge"
-msgstr ""
-
 #. Filter by %s
 #: src/blocks/_pro/post-list/edit.js:237
 msgid "Filter by %s"
@@ -3533,12 +3524,12 @@ msgstr ""
 msgid "Reverse"
 msgstr ""
 
-#: src/extensions/core/group/style.js:181
-msgid "Group link"
+#: src/extensions/core/group/style.js:104
+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:99
-msgid "Because of the theme that enabled theme.json become can specify the color from border panel that, specification from here is deprecated."
+#: src/extensions/core/group/style.js:191
+msgid "Group link"
 msgstr ""
 
 #: src/extensions/core/list/style.js:107
@@ -3896,6 +3887,17 @@ msgstr ""
 msgid "Please select month"
 msgstr ""
 
+#: inc/vk-blocks/build/blocks/_pro/post-category-badge/index.php:97
+#: src/blocks/_pro/post-category-badge/index.php:97
+msgid "Category Badge"
+msgstr ""
+
+#. translators: %s: taxonomy's label
+#: inc/vk-blocks/build/blocks/_pro/post-category-badge/index.php:100
+#: src/blocks/_pro/post-category-badge/index.php:100
+msgid "Display a list of assigned terms from the taxonomy: %s"
+msgstr ""
+
 #: inc/vk-blocks/build/blocks/_pro/taxonomy/index.php:95
 #: src/blocks/_pro/taxonomy/index.php:95
 msgid "Please select taxonomy"