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

【対応中】Outerブロックをカスタムカラーパレットに対応&細かな修正 #950

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4e5c8b3
fix: GenerateBgImage で背景色出力抑制モードを追加
mthaichi Dec 6, 2021
ac5c57e
refactor: GnenerateBgImageリファクタリング
mthaichi Dec 6, 2021
cce80ed
lint
mthaichi Dec 6, 2021
427cea4
fix: outer背景色をキーカラー追随
mthaichi Dec 7, 2021
97aaa16
fix:deprecated修正
mthaichi Dec 7, 2021
989abf3
deprecated 最新版でfitlerが取るように修正
mthaichi Dec 13, 2021
2a3c0c3
deprecatedでfilterが通るように修正
mthaichi Dec 13, 2021
69c2c32
コメント、変数名の変更
mthaichi Dec 13, 2021
dbbabd6
fix: deprecatedなど修正
mthaichi Dec 15, 2021
97ec269
SVG修正
mthaichi Dec 22, 2021
88ce956
枠線のキーカラー追従:途中
mthaichi Dec 23, 2021
e40fcaa
lint
mthaichi Dec 23, 2021
d057bcd
Merge branch 'develop' into fix/outer/custom-color-palette
mthaichi Jan 5, 2022
32e4a9a
fix: deprecated 修正
mthaichi Jan 11, 2022
4ec2e28
lint
mthaichi Jan 11, 2022
b2b92f7
fix: GeneratedBgImageをローカル化
mthaichi Jan 12, 2022
c1f111f
fix: 古いパレットを削除
mthaichi Jan 13, 2022
4df0cf2
Merge branch 'develop' into fix/outer/custom-color-palette
mthaichi Jan 13, 2022
c3a5f0a
Merge commit '74663e6ea27947e23303a6db5e0fe224a8c298cc' into fix/oute…
mthaichi Feb 2, 2022
3cec42b
fix: 枠線Rのマイナス値を0扱いに
mthaichi Feb 2, 2022
9dc1042
fix: ブレイクポイントの値修正
mthaichi Feb 2, 2022
0a30e33
fix: 背景透過が効かない、borderStyleによって枠線の色を反映しない不具合修正
mthaichi Feb 2, 2022
37b0082
fix: 変数名変更
mthaichi Feb 2, 2022
716e50d
fix: Radius値でブロックリカバリーが出るケースを修正
mthaichi Feb 10, 2022
c90b5cf
fix: 背景透過が効かない不具合の修正
mthaichi Feb 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ gulp.task('helper-js-pro', (done) => {
.pipe(uglify())
.pipe(rename('vk-slider.min.js'))
.pipe(gulp.dest('./inc/vk-blocks/build/'));
gulp.src('src/blocks/_pro/outer/enque-front.js')
.pipe(uglify())
.pipe(rename('vk-outer.min.js'))
.pipe(gulp.dest('./inc/vk-blocks/build/'));
done();
});

Expand Down
110 changes: 55 additions & 55 deletions inc/vk-blocks/languages/vk-blocks-js.pot
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ msgid "Short"
msgstr ""

#: src/blocks/_pro/animation/edit.js:123
#: src/blocks/_pro/outer/edit.js:303
#: src/blocks/_pro/outer/edit.js:324
#: src/blocks/_pro/slider/edit.js:193
#: src/blocks/balloon/edit.js:483
#: src/blocks/button/edit.js:223
Expand Down Expand Up @@ -285,7 +285,7 @@ msgid "Padding (Top)"
msgstr ""

#: src/blocks/_pro/grid-column-item/edit.js:139
#: src/blocks/_pro/outer/edit.js:318
#: src/blocks/_pro/outer/edit.js:339
#: src/blocks/_pro/slider-item/edit.js:112
msgid "Padding (Left and Right)"
msgstr ""
Expand All @@ -299,31 +299,31 @@ msgid "Unit"
msgstr ""

#: src/blocks/_pro/grid-column-item/edit.js:177
#: src/blocks/_pro/outer/edit.js:617
#: src/blocks/_pro/outer/edit.js:628
#: src/blocks/icon-outer/edit.js:151
#: src/blocks/icon/edit.js:140
#: src/components/advanced-unit-control/index.js:18
msgid "px"
msgstr ""

#: src/blocks/_pro/grid-column-item/edit.js:181
#: src/blocks/_pro/outer/edit.js:621
#: src/blocks/_pro/outer/edit.js:632
#: src/blocks/icon-outer/edit.js:155
#: src/blocks/icon/edit.js:144
#: src/components/advanced-unit-control/index.js:22
msgid "em"
msgstr ""

#: src/blocks/_pro/grid-column-item/edit.js:185
#: src/blocks/_pro/outer/edit.js:625
#: src/blocks/_pro/outer/edit.js:636
#: src/blocks/icon-outer/edit.js:159
#: src/blocks/icon/edit.js:148
#: src/components/advanced-unit-control/index.js:26
msgid "rem"
msgstr ""

#: src/blocks/_pro/grid-column-item/edit.js:189
#: src/blocks/_pro/outer/edit.js:629
#: src/blocks/_pro/outer/edit.js:640
#: src/blocks/icon-outer/edit.js:163
#: src/blocks/icon/edit.js:152
#: src/components/advanced-unit-control/index.js:30
Expand Down Expand Up @@ -424,236 +424,236 @@ msgstr ""
msgid "Text"
msgstr ""

#: src/blocks/_pro/outer/edit.js:182
#: src/blocks/_pro/outer/edit.js:208
#: src/blocks/_pro/slider-item/edit.js:159
msgid "Background Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:187
#: src/blocks/_pro/outer/edit.js:213
#: src/blocks/_pro/slider-item/edit.js:163
#: src/blocks/pr-content/edit.js:66
msgid "Color Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:188
#: src/blocks/_pro/outer/edit.js:214
#: src/blocks/_pro/slider-item/edit.js:165
msgid ""
"Color will overcome background image. If you want to display image, clear "
"background color or set opacity 0."
msgstr ""

#: src/blocks/_pro/outer/edit.js:201
#: src/blocks/_pro/outer/edit.js:222
#: src/blocks/_pro/slider-item/edit.js:173
msgid "Opacity Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:215
#: src/blocks/_pro/outer/edit.js:236
#: src/blocks/_pro/slider-item/edit.js:208
msgid "Background Image PC"
msgstr ""

#: src/blocks/_pro/outer/edit.js:231
#: src/blocks/_pro/outer/edit.js:252
#: src/blocks/_pro/slider-item/edit.js:224
msgid "Background Image Tablet"
msgstr ""

#: src/blocks/_pro/outer/edit.js:241
#: src/blocks/_pro/outer/edit.js:262
#: src/blocks/_pro/slider-item/edit.js:234
msgid "Background Image Mobile"
msgstr ""

#: src/blocks/_pro/outer/edit.js:251
#: src/blocks/_pro/outer/edit.js:272
msgid "Background image Position"
msgstr ""

#: src/blocks/_pro/outer/edit.js:259
#: src/blocks/_pro/outer/edit.js:280
msgid "Repeat"
msgstr ""

#: src/blocks/_pro/outer/edit.js:263
#: src/blocks/_pro/outer/edit.js:284
msgid "Cover"
msgstr ""

#: src/blocks/_pro/outer/edit.js:267
#: src/blocks/_pro/outer/edit.js:288
msgid "Cover fixed (Not fixed on iPhone)"
msgstr ""

#: src/blocks/_pro/outer/edit.js:274
#: src/blocks/_pro/outer/edit.js:295
msgid "Parallax (Non-guaranteed)"
msgstr ""

#: src/blocks/_pro/outer/edit.js:289
#: src/blocks/_pro/outer/edit.js:310
#: src/blocks/_pro/slider-item/edit.js:107
#: src/blocks/pr-content/edit.js:225
msgid "Layout Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:292
#: src/blocks/_pro/outer/edit.js:313
#: src/blocks/_pro/slider/edit.js:184
msgid "Width"
msgstr ""

#: src/blocks/_pro/outer/edit.js:313
#: src/blocks/_pro/outer/edit.js:334
#: src/blocks/_pro/slider/edit.js:201
msgid "Full Wide"
msgstr ""

#: src/blocks/_pro/outer/edit.js:322
#: src/blocks/_pro/outer/edit.js:343
msgid "Fit to the Content area"
msgstr ""

#: src/blocks/_pro/outer/edit.js:329
#: src/blocks/_pro/outer/edit.js:350
msgid "Add padding to the Outer area"
msgstr ""

#: src/blocks/_pro/outer/edit.js:336
#: src/blocks/_pro/outer/edit.js:357
msgid "Remove padding from the Outer area"
msgstr ""

#: src/blocks/_pro/outer/edit.js:350
#: src/blocks/_pro/outer/edit.js:371
msgid "Padding (Top and Bottom)"
msgstr ""

#: src/blocks/_pro/outer/edit.js:355
#: src/blocks/_pro/outer/edit.js:376
msgid "Use default padding"
msgstr ""

#: src/blocks/_pro/outer/edit.js:362
#: src/blocks/_pro/outer/edit.js:383
msgid "Do not use default padding"
msgstr ""

#: src/blocks/_pro/outer/edit.js:376
#: src/blocks/_pro/outer/edit.js:397
msgid ""
"* If you select \"Do not use\" that, please set yourself it such as a "
"spacer block."
msgstr ""

#: src/blocks/_pro/outer/edit.js:384
#: src/blocks/_pro/outer/edit.js:405
msgid "Divider Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:389
#: src/blocks/_pro/outer/edit.js:410
#: src/blocks/balloon/edit.js:443
msgid "Type"
msgstr ""

#: src/blocks/_pro/outer/edit.js:397
#: src/blocks/_pro/outer/edit.js:418
msgid "Tilt"
msgstr ""

#: src/blocks/_pro/outer/edit.js:401
#: src/blocks/_pro/outer/edit.js:422
msgid "Curve"
msgstr ""

#: src/blocks/_pro/outer/edit.js:405
#: src/blocks/_pro/outer/edit.js:426
msgid "Wave"
msgstr ""

#: src/blocks/_pro/outer/edit.js:409
#: src/blocks/_pro/outer/edit.js:430
#: src/extensions/core/list/style.js:111
msgid "Triangle"
msgstr ""

#: src/blocks/_pro/outer/edit.js:415
#: src/blocks/_pro/outer/edit.js:436
msgid "Upper Divider Level"
msgstr ""

#: src/blocks/_pro/outer/edit.js:440
#: src/blocks/_pro/outer/edit.js:457
msgid "Lower Divider Level"
msgstr ""

#: src/blocks/_pro/outer/edit.js:466
#: src/blocks/_pro/outer/edit.js:479
msgid "Border Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:471
#: src/blocks/_pro/outer/edit.js:484
msgid "Border will disappear when divider effect is applied."
msgstr ""

#: src/blocks/_pro/outer/edit.js:477
#: src/blocks/_pro/outer/edit.js:490
msgid "Border type"
msgstr ""

#: src/blocks/_pro/outer/edit.js:485
#: src/blocks/_pro/outer/edit.js:498
#: src/blocks/_pro/step-item/edit.js:126
#: src/blocks/_pro/timeline-item/edit.js:104
#: src/blocks/balloon/edit.js:543
#: src/blocks/staff/edit.js:177
msgid "None"
msgstr ""

#: src/blocks/_pro/outer/edit.js:489
#: src/blocks/_pro/outer/edit.js:502
#: src/blocks/_pro/step-item/edit.js:104
#: src/blocks/_pro/timeline-item/edit.js:86
#: src/blocks/pr-content/edit.js:143
#: src/extensions/core/group/style.js:102
msgid "Solid"
msgstr ""

#: src/blocks/_pro/outer/edit.js:493
#: src/blocks/_pro/outer/edit.js:506
#: src/extensions/core/group/style.js:110
msgid "Dotted"
msgstr ""

#: src/blocks/_pro/outer/edit.js:497
#: src/blocks/_pro/outer/edit.js:510
#: src/extensions/core/group/style.js:114
msgid "Dashed"
msgstr ""

#: src/blocks/_pro/outer/edit.js:501
#: src/blocks/_pro/outer/edit.js:514
#: src/extensions/core/group/style.js:118
msgid "Double"
msgstr ""

#: src/blocks/_pro/outer/edit.js:505
#: src/blocks/_pro/outer/edit.js:518
msgid "Groove"
msgstr ""

#: src/blocks/_pro/outer/edit.js:509
#: src/blocks/_pro/outer/edit.js:522
msgid "Ridge"
msgstr ""

#: src/blocks/_pro/outer/edit.js:513
#: src/blocks/_pro/outer/edit.js:526
msgid "Inset"
msgstr ""

#: src/blocks/_pro/outer/edit.js:517
#: src/blocks/_pro/outer/edit.js:530
msgid "Outset"
msgstr ""

#: src/blocks/_pro/outer/edit.js:531
#: src/blocks/_pro/outer/edit.js:542
msgid "Border width"
msgstr ""

#: src/blocks/_pro/outer/edit.js:543
#: src/blocks/_pro/outer/edit.js:554
#: src/blocks/icon-outer/edit.js:180
#: src/blocks/icon/edit.js:169
msgid "Border radius"
msgstr ""

#: src/blocks/_pro/outer/edit.js:559
#: src/blocks/_pro/outer/edit.js:570
msgid "Container Inner Side Space Setting"
msgstr ""

#: src/blocks/_pro/outer/edit.js:566
#: src/blocks/_pro/outer/edit.js:577
#: src/blocks/_pro/slider/edit.js:238
#: src/components/advanced-viewport-control/index.js:39
msgid "Mobile"
msgstr ""

#: src/blocks/_pro/outer/edit.js:581
#: src/blocks/_pro/outer/edit.js:592
#: src/blocks/_pro/slider/edit.js:227
#: src/components/advanced-viewport-control/index.js:31
msgid "Tablet"
msgstr ""

#: src/blocks/_pro/outer/edit.js:596
#: src/blocks/_pro/outer/edit.js:607
#: src/blocks/_pro/slider/edit.js:216
#: src/components/advanced-viewport-control/index.js:25
msgid "PC"
msgstr ""

#: src/blocks/_pro/outer/edit.js:607
#: src/blocks/_pro/outer/edit.js:618
#: src/components/advanced-unit-control/index.js:12
msgid "Unit Type"
msgstr ""
Expand Down