Skip to content

Commit

Permalink
Merge branch 'master' into fix/block-settings-description-add
Browse files Browse the repository at this point in the history
  • Loading branch information
miminari committed Aug 3, 2021
2 parents f482a04 + 0ee2a05 commit 27c061e
Show file tree
Hide file tree
Showing 39 changed files with 820 additions and 245 deletions.
26 changes: 17 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,23 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
- run: |
npm install
npm install -g @wordpress/env
wp-env start
composer global require wp-cli/wp-cli-bundle
- run: npm run build
- run: npx gulp dist
- run: cd dist/ && zip -r ${{ env.plugin_name }}.zip ${{ env.plugin_name }}/ && mv ${{ env.plugin_name }}.zip ${GITHUB_WORKSPACE}

- name: Install NPM Scripts
run: npm install
- name: Install @wordpress/env
run: npm install -g @wordpress/env
- name: Run @wordpress/env
run: wp-env start
- name: Install WP-CLI
run: |
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
chmod +x wp-cli.phar
mv wp-cli.phar /usr/local/bin/wp
- name: Build
run: npm run build
- name: Make Distribution
run: |
npx gulp dist
cd dist/ && zip -r ${{ env.plugin_name }}.zip ${{ env.plugin_name }}/ && mv ${{ env.plugin_name }}.zip ${GITHUB_WORKSPACE}
- name: rsync deployments
uses: burnett01/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions editor-css/_editor_before_table.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.editor-styles-wrapper .wp-block-table{
&.is-style-regular{
th,td{
border-top: none;
border-left: none;
border-right: none;
// border-top: none;
// border-left: none;
// border-right: none;
}
}
tfoot {
Expand Down

Large diffs are not rendered by default.

117 changes: 66 additions & 51 deletions inc/vk-blocks/languages/vk-blocks-ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: VK Blocks Pro\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vk-blocks-pro\n"
"POT-Creation-Date: 2021-07-14T01:12:50+00:00\n"
"PO-Revision-Date: 2021-07-14 10:16+0900\n"
"POT-Creation-Date: 2021-07-19T07:02:47+00:00\n"
"PO-Revision-Date: 2021-07-20 11:17+0900\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ja\n"
Expand Down Expand Up @@ -76,7 +76,7 @@ msgid "Short"
msgstr "短い"

#: src/blocks/_pro/animation/edit.js:123 src/blocks/_pro/outer/edit.js:303
#: src/blocks/_pro/slider/edit.js:110 src/blocks/balloon/edit.js:276
#: src/blocks/_pro/slider/edit.js:133 src/blocks/balloon/edit.js:276
#: src/blocks/button/edit.js:95 src/blocks/faq/index.js:27
#: src/blocks/faq2/index.js:22
#: src/extensions/common/inline-font-size/index.js:56
Expand Down Expand Up @@ -270,7 +270,7 @@ msgstr "ボタンの文字"
msgid "Image Height"
msgstr "画像高さ"

#: src/blocks/_pro/card/edit.js:82 src/blocks/_pro/slider/edit.js:129
#: src/blocks/_pro/card/edit.js:82 src/blocks/_pro/slider/edit.js:152
msgid "Slide Height for each device."
msgstr "デバイス毎の高さ"

Expand Down Expand Up @@ -398,36 +398,36 @@ msgstr "テキスト"
msgid "Icon Card"
msgstr "アイコンカード"

#: src/blocks/_pro/outer/edit.js:182 src/blocks/_pro/slider-item/edit.js:122
#: src/blocks/_pro/outer/edit.js:182 src/blocks/_pro/slider-item/edit.js:134
msgid "Background Setting"
msgstr "背景設定"

#: src/blocks/_pro/outer/edit.js:187 src/blocks/_pro/slider-item/edit.js:126
#: src/blocks/_pro/outer/edit.js:187 src/blocks/_pro/slider-item/edit.js:138
#: src/blocks/pr-content/edit.js:66
msgid "Color Setting"
msgstr "色設定"

#: src/blocks/_pro/outer/edit.js:188 src/blocks/_pro/slider-item/edit.js:128
#: src/blocks/_pro/outer/edit.js:188 src/blocks/_pro/slider-item/edit.js:140
msgid ""
"Color will overcome background image. If you want to display image, clear "
"background color or set opacity 0."
msgstr ""
"色を指定すると画像よりも優先されます。画像を表示したい場合は、背景色をクリア"
"するか、不透明度を0に設定します。"

#: src/blocks/_pro/outer/edit.js:201 src/blocks/_pro/slider-item/edit.js:141
#: src/blocks/_pro/outer/edit.js:201 src/blocks/_pro/slider-item/edit.js:153
msgid "Opacity Setting"
msgstr "透過設定"

#: src/blocks/_pro/outer/edit.js:215 src/blocks/_pro/slider-item/edit.js:176
#: src/blocks/_pro/outer/edit.js:215 src/blocks/_pro/slider-item/edit.js:188
msgid "Background Image PC"
msgstr "背景画像 ( PC )"

#: src/blocks/_pro/outer/edit.js:231 src/blocks/_pro/slider-item/edit.js:192
#: src/blocks/_pro/outer/edit.js:231 src/blocks/_pro/slider-item/edit.js:204
msgid "Background Image Tablet"
msgstr "背景画像 ( タブレット )"

#: src/blocks/_pro/outer/edit.js:241 src/blocks/_pro/slider-item/edit.js:202
#: src/blocks/_pro/outer/edit.js:241 src/blocks/_pro/slider-item/edit.js:214
msgid "Background Image Mobile"
msgstr "背景画像背景画像 ( モバイル )"

Expand All @@ -451,20 +451,20 @@ msgstr "カバー 固定(iPhoneでは固定されません)"
msgid "Parallax (Non-guaranteed)"
msgstr "パララックス(非保証)"

#: src/blocks/_pro/outer/edit.js:289 src/blocks/_pro/slider-item/edit.js:70
#: src/blocks/_pro/outer/edit.js:289 src/blocks/_pro/slider-item/edit.js:82
#: src/blocks/pr-content/edit.js:225
msgid "Layout Setting"
msgstr "レイアウト設定"

#: src/blocks/_pro/outer/edit.js:292 src/blocks/_pro/slider/edit.js:101
#: src/blocks/_pro/outer/edit.js:292 src/blocks/_pro/slider/edit.js:124
msgid "Width"
msgstr "幅"

#: src/blocks/_pro/outer/edit.js:313 src/blocks/_pro/slider/edit.js:118
#: src/blocks/_pro/outer/edit.js:313 src/blocks/_pro/slider/edit.js:141
msgid "Full Wide"
msgstr "全幅"

#: src/blocks/_pro/outer/edit.js:318 src/blocks/_pro/slider-item/edit.js:75
#: src/blocks/_pro/outer/edit.js:318 src/blocks/_pro/slider-item/edit.js:87
msgid "Padding (Left and Right)"
msgstr "余白 (左右)"

Expand Down Expand Up @@ -717,102 +717,118 @@ msgstr "選択投稿リストアイテム"
msgid "Selected Post List"
msgstr "選択投稿リスト"

#: src/blocks/_pro/slider-item/edit.js:108
#: src/blocks/_pro/slider-item/edit.js:105
msgid "Remove padding from the Slider area"
msgstr "スライダーアイテムエリア内の余白を無くす"

#: src/blocks/_pro/slider-item/edit.js:120
msgid "Vertical align"
msgstr "縦揃え"

#: src/blocks/_pro/slider-item/edit.js:155
#: src/blocks/_pro/slider-item/edit.js:167
msgid "Background Image Size"
msgstr "背景画像サイズ"

#: src/blocks/_pro/slider-item/edit.js:162
#: src/blocks/_pro/slider-item/edit.js:174
msgid "cover"
msgstr "カバー"

#: src/blocks/_pro/slider-item/edit.js:166
#: src/blocks/_pro/slider-item/edit.js:178
msgid "repeat"
msgstr "リピート"

#: src/blocks/_pro/slider-item/edit.js:79
#: src/blocks/_pro/slider-item/edit.js:91
msgid "Fit to the Container area"
msgstr "コンテナエリアに合わせる"

#: src/blocks/_pro/slider-item/edit.js:86
#: src/blocks/_pro/slider-item/edit.js:98
msgid "Add padding to the Slider area"
msgstr "スライダーアイテムエリア内に余白を追加する"

#: src/blocks/_pro/slider-item/edit.js:93
msgid "Remove padding from the Slider area"
msgstr "スライダーアイテムエリア内の余白を無くす"

#: src/blocks/_pro/slider-item/index.js:18
msgid "Slider Item"
msgstr "スライダーアイテム"

#: src/blocks/_pro/slider/edit.js:124
#: src/blocks/_pro/slider/edit.js:147
msgid "Height"
msgstr "高さ"

#: src/blocks/_pro/slider/edit.js:143
#: src/blocks/_pro/slider/edit.js:166
msgid "Slider Settings"
msgstr "スライド設定"

#: src/blocks/_pro/slider/edit.js:147
#: src/blocks/_pro/slider/edit.js:170
msgid "Effect "
msgstr "エフェクト"

#: src/blocks/_pro/slider/edit.js:157
#: src/blocks/_pro/slider/edit.js:180
msgid "Slide"
msgstr "スライド"

#: src/blocks/_pro/slider/edit.js:161
#: src/blocks/_pro/slider/edit.js:184
msgid "Fade"
msgstr "フェード"

#: src/blocks/_pro/slider/edit.js:168
#: src/blocks/_pro/slider/edit.js:191
msgid "Loop "
msgstr "繰り返し"

#: src/blocks/_pro/slider/edit.js:178
#: src/blocks/_pro/slider/edit.js:201
msgid "AutoPlay"
msgstr "自動再生"

#: src/blocks/_pro/slider/edit.js:187
#: src/blocks/_pro/slider/edit.js:211
msgid "Stop AutoPlay when swipe"
msgstr "スワイプ時に自動再生を停止"

#: src/blocks/_pro/slider/edit.js:221
msgid "Display Time"
msgstr "表示時間"

#: src/blocks/_pro/slider/edit.js:198
#: src/blocks/_pro/slider/edit.js:235
msgid "Change Speed"
msgstr "切り替え時間"

#: src/blocks/_pro/slider/edit.js:212
#: src/blocks/_pro/slider/edit.js:249
msgid "Display Multi Images per View"
msgstr "画像を複数枚表示する"

#: src/blocks/_pro/slider/edit.js:216
#: src/blocks/_pro/slider/edit.js:253
msgid "Images per View"
msgstr "1度に表示する画像の枚数"

#: src/blocks/_pro/slider/edit.js:226
#: src/blocks/_pro/slider/edit.js:264
msgid "Move Images per Slide"
msgstr "1度の動作で動かす枚数"

#: src/blocks/_pro/slider/edit.js:237
msgid "Display Pagination"
msgstr "ページネーションの表示"
#: src/blocks/_pro/slider/edit.js:278
msgid "Pagination Type"
msgstr "ページネーションの種類"

#: src/blocks/_pro/slider/index.js:21
msgid "Slider"
msgstr "スライダー"
#: src/blocks/_pro/slider/edit.js:285 src/blocks/heading/edit.js:342
msgid "Hide"
msgstr "非表示"

#: src/blocks/_pro/step-item/edit.js:110
#: src/blocks/_pro/slider/edit.js:289 src/blocks/_pro/step-item/edit.js:110
#: src/blocks/_pro/table-of-contents-new/edit.js:145
#: src/blocks/_pro/timeline-item/edit.js:91 src/blocks/heading/edit.js:228
#: src/blocks/staff/edit.js:113 src/extensions/core/heading/style.js:30
#: src/extensions/core/list/style.js:102
msgid "Default"
msgstr "標準"

#: src/blocks/_pro/slider/edit.js:293
msgid "Number of slides"
msgstr "スライドの枚数"

#: src/blocks/_pro/slider/index.js:21
msgid "Slider"
msgstr "スライダー"

#: src/blocks/_pro/slider/index.js:23
msgid "Slider is do not move in edit screen."
msgstr "スライダーは編集画面では動きません。公開画面でプレビューしてください。"

#: src/blocks/_pro/step-item/edit.js:54
msgid "Step Mark"
msgstr "ステップマーク"
Expand Down Expand Up @@ -1249,17 +1265,17 @@ msgstr "ボタンサイズ:"
msgid "Large"
msgstr "大"

#: src/blocks/faq/edit.js:14 src/blocks/faq2/edit.js:27
#: src/blocks/faq/edit.js:14 src/blocks/faq2/edit.js:21
msgid ""
"If you want to be collapsing this block, you can set it at Setting > VK "
"Blocks"
msgstr "このブロックを折りたたみたい場合は 設定 > VK Blocks から指定できます"

#: src/blocks/faq/edit.js:19 src/blocks/faq2/edit.js:32
#: src/blocks/faq/edit.js:19 src/blocks/faq2/edit.js:26
msgid "You can be collapsing this block at VK Blocks Pro"
msgstr "Pro版は回答部分を開閉式にできます"

#: src/blocks/faq/edit.js:34 src/blocks/faq2/edit.js:41
#: src/blocks/faq/edit.js:34 src/blocks/faq2/edit.js:35
msgid "Accordion Setting"
msgstr "アコーディオン設定"

Expand Down Expand Up @@ -1403,10 +1419,6 @@ msgstr "サブテキスト設定"
msgid "Display"
msgstr "表示"

#: src/blocks/heading/edit.js:342
msgid "Hide"
msgstr "非表示"

#: src/blocks/heading/edit.js:350
msgid "Text size (rem)"
msgstr "文字サイズ (rem)"
Expand Down Expand Up @@ -2521,6 +2533,9 @@ msgstr ""
"VK-Blocksと競合するため、VK All in One Expansion Unitの Block機能を停止しまし"
"た。"

#~ msgid "Display Pagination"
#~ msgstr "ページネーションの表示"

#~ msgid "Inline Font Size Settings"
#~ msgstr "インライン文字サイズ設定"

Expand Down
Loading

0 comments on commit 27c061e

Please sign in to comment.