Skip to content

Commit

Permalink
Merge branch 'develop' into add/fixed-display/display-hide-timing
Browse files Browse the repository at this point in the history
  • Loading branch information
mtdkei authored Nov 22, 2024
2 parents 045e745 + 0c0bd68 commit 4922967
Show file tree
Hide file tree
Showing 57 changed files with 3,706 additions and 2,035 deletions.
3 changes: 3 additions & 0 deletions editor-css/_editor_after_admin_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ Admin Setting Sidebar utility
.font-size-11px {
font-size: 11px;
}
.font-size-14px {
font-size: 14px;
}

// 下部余白のついたコンポーネントの下に文字を表示したりするためのクラス
.offset-mt-18px {
Expand Down
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ gulp.task('helper-js-pro', (done) => {
.pipe(uglify())
.pipe(rename('vk-table-of-contents-new.min.js'))
.pipe(gulp.dest('./build/'));
gulp.src('src/blocks/_pro/post-list-slider/view.js')
.pipe(uglify())
.pipe(rename('vk-post-list-slider.min.js'))
.pipe(gulp.dest('./build/'));
done();
});

Expand Down
4 changes: 4 additions & 0 deletions inc/vk-blocks/class-vk-blocks-global-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ public static function blocks() {
'name' => 'post-list',
'is_pro' => true,
),
array(
'name' => 'post-list-slider',
'is_pro' => true,
),
array(
'name' => 'post-new-badge',
'is_pro' => true,
Expand Down
2 changes: 1 addition & 1 deletion inc/vk-blocks/view/class-vk-blocks-postlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public static function get_loop_query( $attributes ) {
$tax_query_relation = isset( $attributes['taxQueryRelation'] ) ? $attributes['taxQueryRelation'] : 'OR';

if ( empty( $is_checked_post_type ) ) {
return false;
$is_checked_post_type = 'any';
}

$post__not_in = array();
Expand Down
1 change: 1 addition & 0 deletions inc/vk-blocks/vk-blocks-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,5 +214,6 @@ function vk_blocks_set_wp_version() {
*/
function vk_blocks_load_scripts() {
wp_enqueue_script( 'vk-blocks-slider', VK_BLOCKS_DIR_URL . 'build/vk-slider.min.js', array( 'vk-swiper-script' ), VK_BLOCKS_VERSION, true );
wp_enqueue_script( 'vk-blocks-post-list-slider', VK_BLOCKS_DIR_URL . 'build/vk-post-list-slider.min.js', array( 'vk-swiper-script' ), VK_BLOCKS_VERSION, true );
}
add_action( 'wp_enqueue_scripts', 'vk_blocks_load_scripts' );
2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja.l10n.php

Large diffs are not rendered by default.

Loading

0 comments on commit 4922967

Please sign in to comment.