1
0
mirror of https://github.com/MisskeyIO/misskey synced 2024-11-23 22:56:49 +09:00
This commit is contained in:
syuilo 2021-08-21 17:40:15 +09:00
parent eeff88ece2
commit f6128dd3ff
5 changed files with 49 additions and 17 deletions

View File

@ -16,6 +16,7 @@
- ActivityPub: ジョブキューの試行タイミングを調整 (#7635) - ActivityPub: ジョブキューの試行タイミングを調整 (#7635)
- API: sw/unregisterを追加 - API: sw/unregisterを追加
- ワードミュートのドキュメントを追加 - ワードミュートのドキュメントを追加
- クライアントのデザインの調整
- 依存関係の更新 - 依存関係の更新
### Bugfixes ### Bugfixes

View File

@ -118,6 +118,8 @@ export default defineComponent({
&:not(.noGap) { &:not(.noGap) {
> .notes { > .notes {
background: var(--bg);
.qtqtichx { .qtqtichx {
background: var(--panel); background: var(--panel);
border-radius: var(--radius); border-radius: var(--radius);

View File

@ -7,7 +7,7 @@
<p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p> <p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p>
<div v-else> <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"/> <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>
@ -141,4 +141,8 @@ export default defineComponent({
text-align: center; text-align: center;
color: var(--fg); color: var(--fg);
} }
.elsfgstc {
background: var(--panel);
}
</style> </style>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class=""> <div class="clupoqwt" v-size="{ min: [800] }">
<XNotifications class="_content" @before="before" @after="after" page/> <XNotifications class="notifications" @before="before" @after="after" page/>
</div> </div>
</template> </template>
@ -43,3 +43,17 @@ export default defineComponent({
} }
}); });
</script> </script>
<style lang="scss" scoped>
.clupoqwt {
&.min-width_800px {
background: var(--bg);
padding: 32px 0;
> .notifications {
max-width: 800px;
margin: 0 auto;
}
}
}
</style>

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="cmuxhskf" v-hotkey.global="keymap"> <div class="cmuxhskf" v-hotkey.global="keymap" v-size="{ min: [800] }">
<XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block _isolated"/> <XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block _isolated"/>
<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block _isolated" fixed/> <XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block _isolated" fixed/>
<div class="tabs"> <div class="tabs">
@ -19,17 +19,19 @@
</div> </div>
</div> </div>
<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div> <div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
<XTimeline ref="tl" class="tl" <div class="tl">
:key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src === 'channel' ? `channel:${channel.id}` : src" <XTimeline ref="tl" class="tl"
:src="src" :key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src === 'channel' ? `channel:${channel.id}` : src"
:list="list ? list.id : null" :src="src"
:antenna="antenna ? antenna.id : null" :list="list ? list.id : null"
:channel="channel ? channel.id : null" :antenna="antenna ? antenna.id : null"
:sound="true" :channel="channel ? channel.id : null"
@before="before()" :sound="true"
@after="after()" @before="before()"
@queue="queueUpdated" @after="after()"
/> @queue="queueUpdated"
/>
</div>
</div> </div>
</template> </template>
@ -231,6 +233,7 @@ export default defineComponent({
padding: 0 8px; padding: 0 8px;
white-space: nowrap; white-space: nowrap;
overflow: auto; overflow: auto;
border-bottom: solid 0.5px var(--divider);
// //
position: relative; position: relative;
@ -287,8 +290,16 @@ export default defineComponent({
} }
} }
> .tl { &.min-width_800px {
border-top: solid 0.5px var(--divider); > .tl {
background: var(--bg);
padding: 32px 0;
> .tl {
max-width: 800px;
margin: 0 auto;
}
}
} }
} }
</style> </style>