Skip to content

Commit

Permalink
Merge pull request #2262 from vektor-inc/develop
Browse files Browse the repository at this point in the history
[ Change version ] 1.87.0.0
  • Loading branch information
kurudrive authored Oct 8, 2024
2 parents fc0740b + 176e7dc commit cd9dad0
Show file tree
Hide file tree
Showing 19 changed files with 742 additions and 379 deletions.
2 changes: 2 additions & 0 deletions editor-css/_editor_before.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
.editor-block-list-item-vk-blocks-button-outer:after,
.editor-block-list-item-vk-blocks-card:after,
.editor-block-list-item-vk-blocks-child-page:after,
.editor-block-list-item-vk-blocks-post-category-badge\/category-badge:after,
[class*="editor-block-list-item-vk-blocks-post-category-badge"]:after,
.editor-block-list-item-vk-blocks-dynamic-text:after,
.editor-block-list-item-vk-blocks-timeline:after,
.editor-block-list-item-vk-blocks-step:after,
Expand Down
8 changes: 1 addition & 7 deletions inc/vk-blocks/class-vk-blocks-block-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ public function add_styles() {
// 分割読み込みの場合は register されるファイルが false 指定で何も読み込まれなくなっている.
wp_enqueue_style( 'vk-blocks-build-css' );
wp_enqueue_style( 'vk-blocks-utils-common-css' );
wp_enqueue_style( 'vk-blocks/core-table', VK_BLOCKS_DIR_URL . 'build/extensions/core/table/style.css', array(), VK_BLOCKS_VERSION );
wp_enqueue_style( 'vk-blocks/core-heading', VK_BLOCKS_DIR_URL . 'build/extensions/core/heading/style.css', array(), VK_BLOCKS_VERSION );
wp_enqueue_style( 'vk-blocks/core-image', VK_BLOCKS_DIR_URL . 'build/extensions/core/image/style.css', array(), VK_BLOCKS_VERSION );
}

/**
Expand All @@ -121,12 +118,9 @@ public function register_blocks_assets() {
wp_register_style( 'vk-blocks-build-css', false, array(), VK_BLOCKS_VERSION );
// src/utils内の内の共通cssの読み込み .
wp_register_style( 'vk-blocks-utils-common-css', VK_BLOCKS_DIR_URL . 'build/utils/common.css', array(), VK_BLOCKS_VERSION );
wp_register_style( 'vk-blocks/core-table', VK_BLOCKS_DIR_URL . 'build/extensions/core/table/style.css', array(), VK_BLOCKS_VERSION );
wp_register_style( 'vk-blocks/core-heading', VK_BLOCKS_DIR_URL . 'build/extensions/core/heading/style.css', array(), VK_BLOCKS_VERSION );
wp_register_style( 'vk-blocks/core-image', VK_BLOCKS_DIR_URL . 'build/extensions/core/image/style.css', array(), VK_BLOCKS_VERSION );
} else {
// 一括読み込みの場合 : 結合CSSを登録.
wp_register_style( 'vk-blocks-build-css', VK_BLOCKS_DIR_URL . 'build/block-build.css', array(), VK_BLOCKS_VERSION );
wp_register_style( 'vk-blocks-build-css', VK_BLOCKS_DIR_URL . 'build/block-build.css', array( 'vk-swiper-style' ), VK_BLOCKS_VERSION );
}

// 編集画面のCSS登録 : 分割読み込みの設定に関わらず結合CSSを登録 -> 各ブロックのindex.phpから呼び出される.
Expand Down
2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-admin-js.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-build-js.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja.l10n.php

Large diffs are not rendered by default.

Binary file modified languages/vk-blocks-pro-ja.mo
Binary file not shown.
Loading

0 comments on commit cd9dad0

Please sign in to comment.