Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'notes' (#10008) from Freeplay/calckey:notes into develop

Browse Source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10008
This commit is contained in:
Kainoa Kanter 2023-05-02 22:05:48 +00:00
commit ad41adb24e
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/components/MkNote.vue
View File

@ -510,7 +510,7 @@ function readPromo() {
display: block; display: block;
margin-bottom: -10px; margin-bottom: -10px;
margin-top: 16px; margin-top: 16px;
border-left: 2px solid var(--divider); border-left: 2px solid var(--X13);
margin-left: calc((var(--avatarSize) / 2) - 1px); margin-left: calc((var(--avatarSize) / 2) - 1px);
} }
} }
@ -627,15 +627,12 @@ function readPromo() {
> .body { > .body {
margin-top: 0.7em; margin-top: 0.7em;
> .content {
> .translation { > .translation {
border: solid 0.5px var(--divider); border: solid 0.5px var(--divider);
border-radius: var(--radius); border-radius: var(--radius);
padding: 12px; padding: 12px;
margin-top: 8px; margin-top: 8px;
} }
}
> .renote { > .renote {
padding-top: 8px; padding-top: 8px;
> * { > * {

13
packages/client/src/components/MkVisibility.vue
View File

@ -1,9 +1,14 @@
<template> <template>
<span v-if="note.visibility !== 'public'" :class="$style.visibility"> <span v-if="note.visibility !== 'public'" :class="$style.visibility">
<i v-if="note.visibility === 'home'" class="ph-house ph-bold ph-lg"></i> <i
v-if="note.visibility === 'home'"
class="ph-house ph-bold ph-lg"
v-tooltip="i18n.ts._visibility.home"
></i>
<i <i
v-else-if="note.visibility === 'followers'" v-else-if="note.visibility === 'followers'"
class="ph-lock-simple-open ph-bold ph-lg" class="ph-lock-simple-open ph-bold ph-lg"
v-tooltip="i18n.ts._visibility.followers"
></i> ></i>
<i <i
v-else-if="note.visibility === 'specified'" v-else-if="note.visibility === 'specified'"
@ -12,7 +17,10 @@
></i> ></i>
</span> </span>
<span v-if="note.localOnly" :class="$style.localOnly" <span v-if="note.localOnly" :class="$style.localOnly"
><i class="ph-hand-fist ph-bold ph-lg"></i ><i
class="ph-hand-fist ph-bold ph-lg"
v-tooltip="i18n.ts._visibility.localOnly"
></i
></span> ></span>
</template> </template>
@ -21,6 +29,7 @@ import { ref } from "vue";
import XDetails from "@/components/MkUsersTooltip.vue"; import XDetails from "@/components/MkUsersTooltip.vue";
import * as os from "@/os"; import * as os from "@/os";
import { useTooltip } from "@/scripts/use-tooltip"; import { useTooltip } from "@/scripts/use-tooltip";
import { i18n } from "@/i18n";
const props = defineProps<{ const props = defineProps<{
note: { note: {