Merge pull request #1276 from vektor-inc/develop

[ Change version ] 1.37.0

.eslintrc.js

@@ -4,5 +4,6 @@ module.exports = {
 		'import/no-unresolved': 'off',
 		'import/no-extraneous-dependencies': 'off',
 		camelcase: 'off',
+		'@wordpress/no-unsafe-wp-apis': 'off',
 	},
 };

gulpfile.js

@@ -95,6 +95,21 @@ gulp.task('sass_editor', (done) => {
 	done();
 });
 
+// vk_blocks_options管理画面 css
+gulp.task('sass_vk_blocks_options', (done) => {
+	gulp.src(['./options-css/*.scss'])
+		.pipe(
+			sass({
+				errLogToConsole: true,
+				outputStyle: 'compressed',
+			})
+		)
+		.pipe(autoprefixer())
+		.pipe(concat('vk_blocks_options.css'))
+		.pipe(gulp.dest('./build/'));
+	done();
+});
+
 // VK Block で使用しているBootstrapのみコンパイル
 // ※ Lightning 以外のテーマで利用の際に読込
 gulp.task('sass_bootstrap', (done) => {
@@ -190,6 +205,10 @@ gulp.task('watch', () => {
 		'inc/vk-components/**/*.scss',
 		gulp.parallel('sass_vk_components', 'sass_editor')
 	);
+	gulp.watch(
+		'options-css/*.scss',
+		gulp.parallel('sass_vk_blocks_options')
+	);
 });
 
 //Build : Development
@@ -225,6 +244,7 @@ gulp.task(
 		'sass',
 		'helper-js',
 		'sass_editor',
+		'sass_vk_blocks_options',
 		'sass_bootstrap',
 		'sass_vk_components',
 		'sass-separate-free'
@@ -238,6 +258,7 @@ gulp.task(
 		'helper-js',
 		'helper-js-pro',
 		'sass_editor',
+		'sass_vk_blocks_options',
 		'sass_bootstrap',
 		'sass_vk_components',
 		'sass-separate-free',

inc/vk-blocks/admin/admin-balloon.php

@@ -20,71 +20,6 @@
 	</select>
 	<?php submit_button(); ?>
 	<h4 id="balloon-image-setting"><?php esc_html_e( 'Balloon Image Setting', 'vk-blocks' ); ?></h4>
-	<style type="text/css">
-		.vk_admin_page .adminMain_main .balloonIconList {
-			margin-left:0;
-		}
-		.vk_admin_page .adminMain_main .balloonIconList li {
-			list-style:none;
-		}
-		.balloonIconList {
-			width:100%;
-			display:flex;
-			flex-wrap: wrap;
-		}
-		.balloonIconList li {
-			box-sizing:border-box;
-			width:29.5%;
-			padding:20px 15px 15px;
-			margin:10px;
-			border:1px solid #ccc;
-			border-radius:5px;
-			background-color:rgba(255,255,255,0.9);
-			box-shadow:inset 0px 0px 0px 1px rgba(255,255,255,1);
-		}
-		.balloonIconList_iconFrame {
-			width:100px;
-			margin:0 auto 0.5rem;
-		}
-		.balloonIconList_iconFrame_src {
-			width:100px;
-			height:100px;
-			object-fit:cover;
-			border-radius:50%;
-			border:1px solid #e5e5e5;
-		}
-		.balloonIconList li img {
-
-		}
-		.balloonIconList li .button {
-			width:49%;
-			margin-top:5px;
-			box-shadow:inset 0px 0px 0px 1px rgba(255,255,255,0.7);
-		}
-		.balloonIconList li .button.button-set {
-			color:#464646;
-			border-color:#999;
-			float:left;
-		}
-		.balloonIconList li .button.button-delete {
-			color:#c00;
-			border-color:#c00;
-			float:right;
-		}
-		input.balloonIconList_name_input[type=text] {
-			display:block;
-			width:100%;
-			text-align:center;
-			border-color:#ccc;
-			box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,0.1);
-		}
-		.balloonIconList_nameLabel {
-			clear:both;
-			display:block; overflow:hidden;
-			padding-top:0.5rem;
-			padding-bottom:0.3rem;
-		}
-	</style>
 	<p>
 		<?php esc_html_e( 'You can register frequently used icon images for speech bubble blocks.', 'vk-blocks' ); ?>
 		<?php esc_html_e( 'If you change image or name that please click Save Changes button.', 'vk-blocks' ); ?>

inc/vk-blocks/admin/admin-margin.php

@@ -43,13 +43,6 @@
 			<?php endforeach; ?>
 			</select>
 			</p>
-
-			<style type="text/css">
-			.spacer-input input[type="number"]{
-				width:5em;
-				text-align:center;
-			}
-			</style>
 			<ul class="no-style spacer-input">
 			<?php foreach ( $vk_blocks_margin_size_array as $vk_blocks_margin_size ) : ?>
 				<li>

inc/vk-blocks/admin/admin.php

@@ -149,3 +149,23 @@ function vk_blocks_add_setting_link( $links, $file ) {
 	return $links;
 }
 add_filter( 'plugin_action_links', 'vk_blocks_add_setting_link', 10, 2 );
+
+/**
+ * Enqueue scripts
+ *
+ * @param string $hook_suffix hook suffix.
+ */
+function vk_blocks_options_enqueue_scripts( $hook_suffix ) {
+	// 作成したオプションページ以外では読み込まない.
+	if ( 'settings_page_vk_blocks_options' !== $hook_suffix ) {
+		return;
+	}
+
+	wp_enqueue_style(
+		'vk_blocks_options-style',
+		VK_BLOCKS_DIR_URL . 'build/vk_blocks_options.css',
+		array(),
+		VK_BLOCKS_VERSION
+	);
+}
+add_action( 'admin_enqueue_scripts', 'vk_blocks_options_enqueue_scripts' );