Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

タブブロック追加 #1189

Merged
merged 77 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
40c1192
add : tab
kurudrive Apr 28, 2022
76e78a7
add :tab
kurudrive Apr 30, 2022
f4e06bb
fix : css
kurudrive Apr 30, 2022
7babb9f
fix : タブのCSS調整
kurudrive May 1, 2022
49a5e44
fix / tab : CSS調整
kurudrive May 1, 2022
14fadf6
fix / tab : カラム指定廃止 #1190
kurudrive May 1, 2022
4ec8b19
fix / tab : ブレイクポイントを スマホ/タブレット/PC のみに変更 #1190
kurudrive May 1, 2022
43675c5
lint
kurudrive May 1, 2022
5cacd93
fix / tab : css微調整のみ
kurudrive May 1, 2022
4c0741d
svgicon追加
goutetsuguma May 6, 2022
e70dacf
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer May 11, 2022
2206d13
fix: attribute の形式を変更
drill-lancer May 11, 2022
bf79721
fix: tab-item
drill-lancer May 11, 2022
892f684
fix: tab
drill-lancer May 11, 2022
aa050d6
fix: firstActive
drill-lancer May 11, 2022
1f59d7d
fix: text-domain
drill-lancer May 11, 2022
c479264
add: tabColor
drill-lancer May 12, 2022
10715fa
add: padding control
drill-lancer May 12, 2022
ef1bd0d
fix: tab html
drill-lancer May 12, 2022
21f22df
fix: tab
drill-lancer May 12, 2022
11b31df
フィx:tab-edit
drill-lancer May 12, 2022
914e3fd
fix: tab
drill-lancer May 13, 2022
d97b9e4
fix: tab-item
drill-lancer May 13, 2022
3084244
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer May 13, 2022
bc752bf
fix: test
drill-lancer May 13, 2022
11debf4
fix: readme
drill-lancer May 13, 2022
5dd6911
Merge branch 'develop' into add/tab-block-new
kurudrive May 17, 2022
f0dfba8
タブ body の余白調整
kurudrive May 17, 2022
26c99a7
fix: 余白削除
drill-lancer May 18, 2022
96fed62
fix: line-color
drill-lancer May 19, 2022
70c571d
fix: body boeder top color
drill-lancer May 19, 2022
26ed9ae
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer May 19, 2022
2bfb362
実装スタイル以外をコメントアウト
drill-lancer May 23, 2022
572acb6
fix: 構造変更
drill-lancer May 24, 2022
625a61f
fix: test
drill-lancer May 24, 2022
8752253
fix: front JS
drill-lancer May 24, 2022
e4cac3c
fix: tab-save
drill-lancer May 24, 2022
a18bc18
Merge branch 'develop' into add/tab-block-new
kurudrive May 26, 2022
6ba26e0
fix: tab の色
drill-lancer May 27, 2022
490b12b
fix: タブ上部のDOM
drill-lancer May 27, 2022
2c1f373
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer May 27, 2022
0ddba47
fix: test
drill-lancer May 27, 2022
0b12661
fix: front-js
drill-lancer May 27, 2022
2c46a9d
fix: css
drill-lancer May 27, 2022
855b556
fix : クラス名の余分な空白削除
kurudrive Jun 12, 2022
dd4494a
fix / タブブロック : CSS調整など
kurudrive Jun 13, 2022
319d03f
Merge branch 'develop' into add/tab-block-new
kurudrive Feb 6, 2024
adc8f81
build
kurudrive Feb 6, 2024
ededd1f
update readme
kurudrive Feb 6, 2024
041ebe4
jsエラー修正
kurudrive Feb 6, 2024
fd4a0c5
lint
kurudrive Feb 6, 2024
d5e1f4c
js エラー修正
kurudrive Feb 6, 2024
8bef855
build
kurudrive Feb 6, 2024
2b4355f
test 調整
kurudrive Feb 6, 2024
9fc09bb
lint
kurudrive Feb 6, 2024
e3f55ab
Merge branch 'develop' into add/tab-block-new
kurudrive Mar 26, 2024
3f51d7c
不要CSS削除
kurudrive Mar 26, 2024
4c812ac
編集画面でのCSS調整
kurudrive Mar 26, 2024
1430251
整形のみ
kurudrive Mar 26, 2024
82de814
枠処理修正
kurudrive Mar 26, 2024
2a8fb68
fix: edit
drill-lancer Apr 17, 2024
70b755a
Merge branches 'add/tab-block-new' and 'develop' of github.com:vektor…
drill-lancer Apr 17, 2024
822a1e6
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer Apr 17, 2024
8c56be9
build
drill-lancer Apr 17, 2024
600f8c9
fix: shadow
drill-lancer Apr 18, 2024
46cedf4
lint
drill-lancer Apr 18, 2024
557e0ce
add: group
drill-lancer Apr 18, 2024
ca62a10
Merge branch 'develop' of github.com:vektor-inc/vk-blocks-pro into ad…
drill-lancer Apr 18, 2024
93d7753
fix: readme
drill-lancer Apr 18, 2024
a9fffc6
fixd: test
drill-lancer Apr 18, 2024
af1270f
Merge branch 'develop' into add/tab-block-new
kurudrive May 6, 2024
c620fa9
ユーザーが使おうとすると余白など一切ない状態でスタートしてしまうのでデザイン調整
kurudrive May 6, 2024
d565bfa
lint
kurudrive May 6, 2024
6ad90db
[ タブブロック ] インナーテンプレートを block.json に移動 / グループブロックに余白など指定
kurudrive May 6, 2024
25551cf
build
kurudrive May 6, 2024
5baf0b1
Adjust CSS for has-border-top
mtdkei May 7, 2024
89b7580
Merge branch 'develop' into add/tab-block-new
kurudrive May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor-css/_editor_before.scss
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ div[data-type="vk-blocks/page-content"].is-selected{
// アニメーションブロックの識別用枠線
@import "./editor_before_animation";

@import "./editor_before_tab";

// アイコンカードの見出しがテーマの見出し指定機能に負けるので上書き
@import "./editor_before_icon-card";

Expand Down
26 changes: 26 additions & 0 deletions editor-css/_editor_before_tab.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* 編集画面
/*-------------------------------------------*/

.vk_tab{
position: relative;
&.is-style-vk_tab_labels-line .vk_tab_labels {
margin-bottom: -1px;
}
ul.vk_tab_labels{
margin:0;
padding: 0;
li {
margin-bottom:0;
}
}
.block-list-appender{
position: absolute;
top: calc(var(--vk-size-text) * -6 );
right: calc(var(--vk-size-text) * 0 );
}
}

.vk_tab_bodys .vk_tab_bodys_body.vk_tab_bodys_body-state-active {
margin-top: 0;
margin-bottom: 0;
}
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ gulp.task('helper-js-pro', (done) => {
.pipe(uglify())
.pipe(rename('vk-animation.min.js'))
.pipe(gulp.dest('./build/'));
gulp.src('src/blocks/_pro/tab/view.js')
.pipe(uglify())
.pipe(rename('vk-tab.min.js'))
.pipe(gulp.dest('./build/'));
done();
});

Expand Down
3 changes: 3 additions & 0 deletions inc/vk-blocks-pro/vk-blocks-pro-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ function vk_blocks_pro_load_scripts() {

// Animation Block
wp_enqueue_script( 'vk-blocks-animation', VK_BLOCKS_DIR_URL . 'build/vk-animation.min.js', array(), VK_BLOCKS_VERSION, true );

// Tab Block
wp_enqueue_script( 'vk-blocks-tab', VK_BLOCKS_DIR_URL . 'build/vk-tab.min.js', array(), VK_BLOCKS_VERSION, true );
}
add_action( 'wp_enqueue_scripts', 'vk_blocks_pro_load_scripts' );
8 changes: 8 additions & 0 deletions inc/vk-blocks/class-vk-blocks-global-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,14 @@ public static function blocks() {
'name' => 'step-item',
'is_pro' => true,
),
array(
'name' => 'tab',
'is_pro' => true,
),
array(
'name' => 'tab-item',
'is_pro' => true,
),
array(
'name' => 'table-of-contents-new',
'is_pro' => true,
Expand Down
Loading
Loading