summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-10-20 09:28:48 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-10-20 09:28:48 +0900
commit70897c0e9a0e8b1e99c307d0f0672ac945ce9774 (patch)
treea19abba9d1bf93edb5e0e29538b9cce2f792edcf /src
parentFix test (diff)
downloadmisskey-70897c0e9a0e8b1e99c307d0f0672ac945ce9774.tar.gz
misskey-70897c0e9a0e8b1e99c307d0f0672ac945ce9774.tar.bz2
misskey-70897c0e9a0e8b1e99c307d0f0672ac945ce9774.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/notes.vue13
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notes.vue13
2 files changed, 20 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 38a27a1295..023f15bd90 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -4,9 +4,9 @@
<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
- <div v-if="!fetching && requestInitPromise != null">
- <p>%i18n:@error%</p>
- <button @click="resolveInitPromise">%i18n:@retry%</button>
+ <div v-if="!fetching && requestInitPromise != null" class="error">
+ <p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
+ <ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
</div>
<div class="placeholder" v-if="fetching">
@@ -215,6 +215,13 @@ export default Vue.extend({
> *
transition transform .3s ease, opacity .3s ease
+ > .error
+ max-width 300px
+ margin 0 auto
+ padding 16px
+ text-align center
+ color var(--text)
+
> .placeholder
padding 32px
opacity 0.3
diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue
index ec1298369a..e545f18256 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@@ -8,9 +8,9 @@
</template>
</div>
- <div v-if="!fetching && requestInitPromise != null">
- <p>%i18n:@error%</p>
- <button @click="resolveInitPromise">%i18n:@retry%</button>
+ <div v-if="!fetching && requestInitPromise != null" class="error">
+ <p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
+ <ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
</div>
<!-- トランジションを有効にするとなぜかメモリリークする -->
@@ -226,6 +226,13 @@ export default Vue.extend({
> *
transition transform .3s ease, opacity .3s ease
+ > .error
+ max-width 300px
+ margin 0 auto
+ padding 16px
+ text-align center
+ color var(--text)
+
> .placeholder
padding 16px
opacity 0.3