OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-11-15 20:06:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

merge: last minute changes

Browse source
This commit is contained in:
Mar0xy 2023-11-07 20:07:53 +01:00
commit 6d5d863150
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkNoteHeader.vue
View file

@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<i v-else-if="note.visibility === 'followers'" class="ph-lock ph-bold ph-lg"></i> <i v-else-if="note.visibility === 'followers'" class="ph-lock ph-bold ph-lg"></i>
<i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope ph-bold ph-lg"></i> <i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope ph-bold ph-lg"></i>
</span> </span>
<span v-if="note.updatedAt" ref="menuVersionsButton" style="margin-left: 0.5em;" title="Edited" @mousedown="menuVersions()"><i class="ph-pencil ph-bold ph-lg"></i></span> <span v-if="note.updatedAt" ref="menuVersionsButton" style="margin-left: 0.5em; cursor: pointer;" title="Edited" @mousedown="menuVersions()"><i class="ph-pencil ph-bold ph-lg"></i></span>
<span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ph-rocket ph-bold ph-lg"></i></span> <span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ph-rocket ph-bold ph-lg"></i></span>
<span v-if="note.channel" style="margin-left: 0.5em;" :title="note.channel.name"><i class="ph-television ph-bold ph-lg"></i></span> <span v-if="note.channel" style="margin-left: 0.5em;" :title="note.channel.name"><i class="ph-television ph-bold ph-lg"></i></span>
</div> </div>

2
packages/frontend/src/components/MkNotification.vue
View file

@ -358,7 +358,7 @@ const rejectFollowRequest = () => {
width: 20px; width: 20px;
height: 20px; height: 20px;
box-sizing: border-box; box-sizing: border-box;
border-radius: 100%; border-radius: var(--radius-full);
background: var(--panel); background: var(--panel);
box-shadow: 0 0 0 3px var(--panel); box-shadow: 0 0 0 3px var(--panel);
font-size: 11px; font-size: 11px;

2
packages/frontend/src/components/MkTutorialDialog.PostNote.vue
View file

@ -115,7 +115,7 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
border-radius: 999px; border-radius: var(--radius-ellipse);
background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB)); background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
} }

2
packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
View file

@ -125,7 +125,7 @@ const exampleNote = reactive<Misskey.entities.Note>({
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
border-radius: 999px; border-radius: var(--radius-ellipse);
background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB)); background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
} }

2
packages/frontend/src/components/MkTutorialDialog.Timeline.vue
View file

@ -67,7 +67,7 @@ import { i18n } from '@/i18n.js';
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
border-radius: 999px; border-radius: var(--radius-ellipse);
background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB)); background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
} }

2
packages/frontend/src/components/MkUserOnlineIndicator.vue
View file

@ -38,7 +38,7 @@ const text = $computed(() => {
.root { .root {
box-shadow: 0 0 0 3px var(--panel); box-shadow: 0 0 0 3px var(--panel);
// sharkey(ShittyKopper): the comment mentions something about 100% radius not behaving correctly on blink. // sharkey: the comment mentions something about 100% radius not behaving correctly on blink.
// couldn't reproduce, assuming the 120% here was just an old workaround // couldn't reproduce, assuming the 120% here was just an old workaround
border-radius: var(--radius-full); // Blinkのバグか知らんけど、100%ぴったりにすると何故か若干楕円でレンダリングされる border-radius: var(--radius-full); // Blinkのバグか知らんけど、100%ぴったりにすると何故か若干楕円でレンダリングされる

8
packages/frontend/src/components/global/MkAvatar.vue
View file

@ -159,7 +159,7 @@ watch(() => props.user.avatarBlurhash, () => {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: bottom;
flex-shrink: 0; flex-shrink: 0;
border-radius: 100%; border-radius: 100%; // sharkey: controlled by square avatars setting!
line-height: 16px; line-height: 16px;
} }
@ -169,7 +169,7 @@ watch(() => props.user.avatarBlurhash, () => {
left: 0; left: 0;
right: 0; right: 0;
top: 0; top: 0;
border-radius: 100%; border-radius: 100%; // sharkey: controlled by square avatars setting!
z-index: 1; z-index: 1;
overflow: clip; overflow: clip;
object-fit: cover; object-fit: cover;
@ -187,10 +187,10 @@ watch(() => props.user.avatarBlurhash, () => {
} }
.square { .square {
border-radius: 20%; border-radius: 20%; // sharkey: controlled by square avatars setting!
> .inner { > .inner {
border-radius: 20%; border-radius: 20%; // sharkey: controlled by square avatars setting!
} }
} }

4
packages/frontend/src/components/global/MkEmoji.vue
View file

@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
--> -->
<template> <template>
<img v-if="!useOsNativeEmojis" :class="$style.root" :src="url" :alt="props.emoji" decoding="async" @pointerenter="computeTitle" @click="onClick"/> <img v-if="!useOsNativeEmojis" :class="$style.root" :src="url" :alt="props.emoji" decoding="async" @pointerenter="computeTitle" @click="onClick" v-on:click.stop/>
<span v-else-if="useOsNativeEmojis" :alt="props.emoji" @pointerenter="computeTitle" @click="onClick">{{ props.emoji }}</span> <span v-else-if="useOsNativeEmojis" :alt="props.emoji" @pointerenter="computeTitle" @click="onClick" v-on:click.stop>{{ props.emoji }}</span>
<span v-else>{{ emoji }}</span> <span v-else>{{ emoji }}</span>
</template> </template>