mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-02 16:58:43 +09:00
Code

🎨

Browse Source
This commit is contained in:
syuilo 2018-10-20 09:28:48 +09:00
parent f51d1c5264
commit 70897c0e9a
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
locales/ja-JP.yml
View File

@ -124,6 +124,10 @@ common:
do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。' do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
error:
title: '問題が発生しました'
retry: 'やり直す'
reversi: reversi:
drawn: "引き分け" drawn: "引き分け"
my-turn: "あなたのターンです" my-turn: "あなたのターンです"

13
src/client/app/desktop/views/components/notes.vue
View File

@ -4,9 +4,9 @@
<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot> <slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
<div v-if="!fetching && requestInitPromise != null"> <div v-if="!fetching && requestInitPromise != null" class="error">
<p>%i18n:@error%</p> <p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
<button @click="resolveInitPromise">%i18n:@retry%</button> <ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
</div> </div>
<div class="placeholder" v-if="fetching"> <div class="placeholder" v-if="fetching">
@ -215,6 +215,13 @@ export default Vue.extend({
> * > *
transition transform .3s ease, opacity .3s ease transition transform .3s ease, opacity .3s ease
> .error
max-width 300px
margin 0 auto
padding 16px
text-align center
color var(--text)
> .placeholder > .placeholder
padding 32px padding 32px
opacity 0.3 opacity 0.3

13
src/client/app/desktop/views/pages/deck/deck.notes.vue
View File

@ -8,9 +8,9 @@
</template> </template>
</div> </div>
<div v-if="!fetching && requestInitPromise != null"> <div v-if="!fetching && requestInitPromise != null" class="error">
<p>%i18n:@error%</p> <p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
<button @click="resolveInitPromise">%i18n:@retry%</button> <ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
</div> </div>
<!-- トランジションを有効にするとなぜかメモリリークする --> <!-- トランジションを有効にするとなぜかメモリリークする -->
@ -226,6 +226,13 @@ export default Vue.extend({
> * > *
transition transform .3s ease, opacity .3s ease transition transform .3s ease, opacity .3s ease
> .error
max-width 300px
margin 0 auto
padding 16px
text-align center
color var(--text)
> .placeholder > .placeholder
padding 16px padding 16px
opacity 0.3 opacity 0.3