summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-21 11:37:18 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-21 11:37:18 +0900
commitb54539b647f29d4dc13a6187a84a38bfe211766a (patch)
tree1fb79f8cd4290165ac429b40b9c1f9fce3cb25b5 /src
parentImprove ServiceWorker notification (diff)
downloadsharkey-b54539b647f29d4dc13a6187a84a38bfe211766a.tar.gz
sharkey-b54539b647f29d4dc13a6187a84a38bfe211766a.tar.bz2
sharkey-b54539b647f29d4dc13a6187a84a38bfe211766a.zip
Fix bug
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/notes.vue3
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notes.vue3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 5c595c4ca5..1206eb7136 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -11,6 +11,7 @@
<!-- トランジションを有効にするとなぜかメモリリークする -->
<!--<transition-group name="mk-notes" class="transition">-->
+ <div class="notes">
<template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
@@ -18,6 +19,7 @@
<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
</p>
</template>
+ </div>
<!--</transition-group>-->
<footer v-if="more">
@@ -222,6 +224,7 @@ root(isDark)
> *
transition transform .3s ease, opacity .3s ease
+ > .notes
> .date
display block
margin 0
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 c135c6cd5a..a5ed45b64c 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@@ -9,6 +9,7 @@
<!-- トランジションを有効にするとなぜかメモリリークする -->
<!--<transition-group name="mk-notes" class="transition">-->
+ <div class="notes">
<template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :media-view="mediaView"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
@@ -16,6 +17,7 @@
<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
</p>
</template>
+ </div>
<!--</transition-group>-->
<footer v-if="more">
@@ -199,6 +201,7 @@ root(isDark)
> *
transition transform .3s ease, opacity .3s ease
+ > .notes
> .date
display block
margin 0