This commit is contained in:
syuilo 2021-04-18 14:29:31 +09:00
parent d7a042b95d
commit e04d866b20
4 changed files with 11 additions and 15 deletions

View File

@ -6,8 +6,8 @@
<p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p> <p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p>
<div v-else class="_magnetParent"> <div v-else>
<XList class="notifications _magnetChild" :items="items" v-slot="{ item: notification }" :no-gap="true"> <XList class="notifications" :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"/> <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"/> <XNotification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
</XList> </XList>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="xcukqgmh _root _magnetParent" v-if="page" :key="page.id" v-size="{ max: [450] }"> <div class="xcukqgmh _root" v-if="page" :key="page.id" v-size="{ max: [450] }">
<div class="_block _magnetChild main"> <div class="_block main">
<!-- <!--
<div class="header"> <div class="header">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>

View File

@ -1,10 +1,8 @@
<template> <template>
<div class="cmuxhskf _root _magnetParent" v-hotkey.global="keymap"> <div class="cmuxhskf _root" v-hotkey.global="keymap">
<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
<XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block"/> <XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block"/>
<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block" fixed/> <XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block" fixed/>
<div class="tabs _block _magnetChild"> <div class="tabs _block">
<div class="left"> <div class="left">
<button class="_button tab" @click="() => { src = 'home'; saveSrc(); }" :class="{ active: src === 'home' }" v-tooltip="$ts._timelines.home"><Fa :icon="faHome"/></button> <button class="_button tab" @click="() => { src = 'home'; saveSrc(); }" :class="{ active: src === 'home' }" v-tooltip="$ts._timelines.home"><Fa :icon="faHome"/></button>
<button class="_button tab" @click="() => { src = 'local'; saveSrc(); }" :class="{ active: src === 'local' }" v-tooltip="$ts._timelines.local" v-if="isLocalTimelineAvailable"><Fa :icon="faComments"/></button> <button class="_button tab" @click="() => { src = 'local'; saveSrc(); }" :class="{ active: src === 'local' }" v-tooltip="$ts._timelines.local" v-if="isLocalTimelineAvailable"><Fa :icon="faComments"/></button>
@ -32,6 +30,7 @@
@after="after()" @after="after()"
@queue="queueUpdated" @queue="queueUpdated"
/> />
<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
</div> </div>
</template> </template>

View File

@ -243,7 +243,10 @@ hr {
._block { ._block {
@extend ._panel; @extend ._panel;
margin: var(--margin) 0;
& + ._block {
margin-top: var(--margin);
}
} }
._gap { ._gap {
@ -375,12 +378,6 @@ hr {
} }
} }
._magnetParent {
._magnetChild:not(* + ._magnetChild) {
margin-top: 0;
}
}
._narrow_ ._card { ._narrow_ ._card {
> ._title { > ._title {
padding: 16px; padding: 16px;