mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-05 12:43:09 +02:00
merge: ui tweaks
This commit is contained in:
commit
a8e46163a5
11 changed files with 23 additions and 8 deletions
|
@ -178,6 +178,8 @@ export default defineComponent({
|
|||
}
|
||||
|
||||
.date-separated-list-nogap {
|
||||
border-radius: var(--radius);
|
||||
|
||||
> * {
|
||||
margin: 0 !important;
|
||||
border: none;
|
||||
|
|
|
@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
-->
|
||||
|
||||
<template>
|
||||
<div ref="root">
|
||||
<div ref="root" :class="$style.root">
|
||||
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
|
||||
<div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container">
|
||||
<div
|
||||
|
@ -260,6 +260,10 @@ const previewable = (file: Misskey.entities.DriveFile): boolean => {
|
|||
</script>
|
||||
|
||||
<style lang="scss" module>
|
||||
.root {
|
||||
cursor: auto; /* not clickToOpen-able */
|
||||
}
|
||||
|
||||
.container {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
|
|
|
@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
<article v-else :class="$style.article" @contextmenu.stop="onContextmenu">
|
||||
<div v-if="appearNote.channel" :class="$style.colorBar" :style="{ background: appearNote.channel.color }"></div>
|
||||
<MkAvatar :class="$style.avatar" :user="appearNote.user" link preview/>
|
||||
<div :class="$style.main" @click="defaultStore.state.clickToOpen ? noteclick(appearNote.id) : undefined">
|
||||
<div :class="[$style.main, { [$style.clickToOpen]: defaultStore.state.clickToOpen }]" @click="defaultStore.state.clickToOpen ? noteclick(appearNote.id) : undefined">
|
||||
<MkNoteHeader :note="appearNote" :mini="true" v-on:click.stop/>
|
||||
<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance"/>
|
||||
<div style="container-type: inline-size;">
|
||||
|
@ -852,7 +852,6 @@ function readPromo() {
|
|||
}
|
||||
|
||||
.cw {
|
||||
cursor: default;
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
@ -1096,4 +1095,8 @@ function readPromo() {
|
|||
padding: 0 6px;
|
||||
opacity: .8;
|
||||
}
|
||||
|
||||
.clickToOpen {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -56,6 +56,7 @@ async function menuVersions(viaKeyboard = false): Promise<void> {
|
|||
display: flex;
|
||||
align-items: baseline;
|
||||
white-space: nowrap;
|
||||
cursor: auto; /* not clickToOpen-able */
|
||||
}
|
||||
|
||||
.name {
|
||||
|
|
|
@ -73,7 +73,6 @@ watch(() => props.expandAllCws, (expandAllCws) => {
|
|||
}
|
||||
|
||||
.cw {
|
||||
cursor: default;
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
|
|
@ -478,7 +478,6 @@ if (props.detail) {
|
|||
}
|
||||
|
||||
.cw {
|
||||
cursor: default;
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
|
|
@ -55,6 +55,8 @@ defineExpose({
|
|||
<style lang="scss" module>
|
||||
.root {
|
||||
&.noGap {
|
||||
border-radius: var(--radius);
|
||||
|
||||
> .notes {
|
||||
background: color-mix(in srgb, var(--panel) 65%, transparent);
|
||||
}
|
||||
|
|
|
@ -86,6 +86,7 @@ watch([() => props.note.reactions, () => props.maxNumber], ([newSource, maxNumbe
|
|||
|
||||
.root {
|
||||
margin: 4px -2px 0 -2px;
|
||||
cursor: auto; /* not clickToOpen-able */
|
||||
|
||||
&:empty {
|
||||
display: none;
|
||||
|
|
|
@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
|
||||
<template>
|
||||
<div :class="[$style.root, { [$style.collapsed]: collapsed }]">
|
||||
<div @click="defaultStore.state.clickToOpen ? noteclick(note.id) : undefined">
|
||||
<div :class="{ [$style.clickToOpen]: defaultStore.state.clickToOpen }" @click="defaultStore.state.clickToOpen ? noteclick(note.id) : undefined">
|
||||
<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
|
||||
<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
|
||||
<MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`" v-on:click.stop><i class="ph-arrow-bend-left-up ph-bold pg-lg"></i></MkA>
|
||||
|
@ -134,4 +134,8 @@ const collapsed = $ref(isLong);
|
|||
border-radius: var(--radius-ellipse);
|
||||
box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
|
||||
}
|
||||
|
||||
.clickToOpen {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -169,7 +169,7 @@ watch(() => props.user.avatarBlurhash, () => {
|
|||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
border-radius: var(--radius-full);
|
||||
border-radius: 100%;
|
||||
z-index: 1;
|
||||
overflow: clip;
|
||||
object-fit: cover;
|
||||
|
|
|
@ -520,7 +520,7 @@ onUnmounted(() => {
|
|||
z-index: 2;
|
||||
width: 120px;
|
||||
height: 120px;
|
||||
box-shadow: 1px 1px 3px rgba(#000, 0.2);
|
||||
filter: drop-shadow(1px 1px 3px rgba(#000, 0.2));
|
||||
}
|
||||
|
||||
> .roles {
|
||||
|
|
Loading…
Reference in a new issue