limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-21 17:37:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2023-05-02 15:15:05 -07:00
commit d07a294f33
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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,14 +627,11 @@ function readPromo() {
> .body { > .body {
margin-top: 0.7em; margin-top: 0.7em;
> .translation {
> .content { border: solid 0.5px var(--divider);
> .translation { border-radius: var(--radius);
border: solid 0.5px var(--divider); padding: 12px;
border-radius: var(--radius); margin-top: 8px;
padding: 12px;
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: {