Update from vk-filter-search-pro

vektor-inc · May 23, 2024 · 0238169 · 0238169
1 parent 26eec57
commit 0238169
Show file tree

Hide file tree

Showing 8 changed files with 330 additions and 201 deletions.
diff --git a/inc/filter-search/package/class-vk-filter-search.php b/inc/filter-search/package/class-vk-filter-search.php
@@ -922,9 +922,9 @@ public static function form_edit_content( $post_id, $old_flag ) {
 				$edit_content .= '<div class="vkfs_old-form-alert" data-nosnippet">';
 				$edit_content .= '<div class="vkfs_old-form-alert--icon"><i class="fa-solid fa-circle-info"></i></div>';
 				$edit_content .= '<div class="vkfs_old-form-alert--text">';
-				$edit_content .= __( 'This form is obsolete and may eventually become obsolete.', 'vk-filter-search' );
+				$edit_content .= __( 'This form is obsolete and may eventually be deleted.', 'vk-filter-search' );
 				$edit_content .= '<br>';
-				$edit_content .= __( 'We recommend creating a form with the post type "Filteer Search".', 'vk-filter-search' );
+				$edit_content .= __( 'We recommend creating a form with the post type "VK Filteer Search".', 'vk-filter-search' );
 				$edit_content .= '<br>';
 				$edit_content .= __( 'The post of "VK Filter Search" can be called by the "Call Filter Search" block.', 'vk-filter-search' );
 				$edit_content .= '</div>';

diff --git a/inc/filter-search/package/src/filter-search/editor.scss b/inc/filter-search/package/src/filter-search/editor.scss
@@ -134,11 +134,19 @@ html :where(.editor-styles-wrapper) {
 
 		.vkfs__label-name-wrap {
 			margin-right:10px;
+			ul {
+				margin-block-start: 0;
+				margin-block-end: 0;
+			}
 			li {
 				margin-top:0;
 				line-height: 2;
 			}
 		}
+		ul.vkfs__input-wrap { // x-t9 チェックボックス上下に無駄に余白ができるので追加
+			margin-block-start: 0;
+			margin-block-end: 0;
+		}
 
 	}
 	//無料版のインサーターのデザイン

diff --git a/inc/filter-search/package/src/filter-search/style.scss b/inc/filter-search/package/src/filter-search/style.scss
@@ -51,16 +51,25 @@ html :where(.editor-styles-wrapper) {
 	}
 
 	&__label-name {
+		white-space: nowrap;
 		font-weight: 700;
 		margin-bottom: calc(var(--vk-size-text) * 0.5);
 	}
 
 	.vkfs__label-name-wrap {
 		display: flex;
-		flex-wrap: nowrap;
+		/* 
+		flex-wrap を wrap にしておかないと AND OR をユーザーに選択させてる場合に
+		サイドバーが狭いときに AND OR が潰れるてしまう
+		 */
+		flex-wrap: wrap; 
 		justify-content: space-between;
 		align-items: center;
 
+		row-gap: 5px;
+		input[name="vkfs_category_operator"]{
+			top:3px;
+		}
 		.vkfs__operator-wrap {
 			gap: 1em;
 			margin-right: 10px;

diff --git a/inc/filter-search/package/src/search-result-title/edit.js b/inc/filter-search/package/src/search-result-title/edit.js
@@ -345,7 +345,7 @@ export default function SearchTitleEdit( props ) {
 					<BaseControl id={ 'vkfs_searchTitle_queryElementsAfter' }>
 						<TextControl
 							label={ __(
-								'The separator string after the query element.',
+								'The separator string after the query element',
 								'vk-filter-search'
 							) }
 							value={ queryElementsAfter }