diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
| commit | f00ceedae48e7969ca9e80f0af2280bf060421ec (patch) | |
| tree | 620bb82f6a2ce41f3b3b3d187242bd5bc8e35171 /src/client/components | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.89.0 (diff) | |
| download | misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.gz misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.bz2 misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/notes.vue | 2 | ||||
| -rw-r--r-- | src/client/components/notifications.vue | 6 | ||||
| -rw-r--r-- | src/client/components/post-form.vue | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index ba3b7d2b39..919cb29952 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -118,6 +118,8 @@ export default defineComponent({ &:not(.noGap) { > .notes { + background: var(--bg); + .qtqtichx { background: var(--panel); border-radius: var(--radius); diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index 9db47e08d6..e91f18a693 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -7,7 +7,7 @@ <p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p> <div v-else> - <XList class="notifications" :items="items" v-slot="{ item: notification }" :no-gap="true"> + <XList class="elsfgstc" :items="items" v-slot="{ item: notification }" :no-gap="true"> <XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :note="notification.note" @update:note="noteUpdated(notification.note, $event)" :key="notification.id"/> <XNotification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/> </XList> @@ -141,4 +141,8 @@ export default defineComponent({ text-align: center; color: var(--fg); } + +.elsfgstc { + background: var(--panel); +} </style> diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 221dc74313..657053cc93 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -339,7 +339,12 @@ export default defineComponent({ this.cw = init.cw; this.useCw = init.cw != null; if (init.poll) { - this.poll = init.poll; + this.poll = { + choices: init.poll.choices.map(x => x.text), + multiple: init.poll.multiple, + expiresAt: init.poll.expiresAt, + expiredAfter: init.poll.expiredAfter, + }; } this.visibility = init.visibility; this.localOnly = init.localOnly; |