mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-01 16:28:06 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ThatOneCalculator 2023-06-04 14:41:30 -07:00
commit aca3416e12
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/components/MkMention.vue
View File

@ -2,7 +2,7 @@
<MkA <MkA
v-if="url.startsWith('/')" v-if="url.startsWith('/')"
v-user-preview="canonical" v-user-preview="canonical"
class="akbvjaqn" class="mention"
:class="{ isMe }" :class="{ isMe }"
:to="url" :to="url"
@click.stop @click.stop
@ -19,7 +19,7 @@
</MkA> </MkA>
<a <a
v-else v-else
class="akbvjaqn" class="mention"
:href="url" :href="url"
target="_blank" target="_blank"
rel="noopener" rel="noopener"
@ -58,7 +58,7 @@ const isMe =
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.akbvjaqn { .mention {
position: relative; position: relative;
display: inline-block; display: inline-block;
padding: 2px 8px 2px 2px; padding: 2px 8px 2px 2px;
@ -68,6 +68,7 @@ const isMe =
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
color: var(--mention); color: var(--mention);
isolation: isolate;
&::before { &::before {
content: ""; content: "";

3
packages/client/src/components/global/MkPageHeader.vue
View File

@ -372,6 +372,7 @@ onUnmounted(() => {
display: flex; display: flex;
> .buttons { > .buttons {
&:not(:empty) { &:not(:empty) {
margin-right: 8px;
margin-left: calc(0px - var(--margin)); margin-left: calc(0px - var(--margin));
} }
> .avatar { > .avatar {
@ -424,7 +425,7 @@ onUnmounted(() => {
width: $size; width: $size;
height: $size; height: $size;
vertical-align: bottom; vertical-align: bottom;
margin: 0 8px; margin-right: 8px;
} }
> .icon { > .icon {

2
packages/client/src/navbar.ts
View File

@ -91,7 +91,7 @@ export const navbarItemDef = reactive({
to: "/gallery", to: "/gallery",
}, },
clips: { clips: {
title: "clip", title: "clips",
icon: "ph-paperclip ph-bold ph-lg", icon: "ph-paperclip ph-bold ph-lg",
show: computed(() => $i != null), show: computed(() => $i != null),
to: "/my/clips", to: "/my/clips",

8
packages/client/src/pages/timeline.vue
View File

@ -152,8 +152,8 @@ function top(): void {
scroll(rootEl, { top: 0 }); scroll(rootEl, { top: 0 });
} }
async function chooseList(ev: MouseEvent): Promise<void> { const lists = await os.api("users/lists/list");
const lists = await os.api("users/lists/list"); function chooseList(ev: MouseEvent) {
const items = [ const items = [
{ {
type: "link" as const, type: "link" as const,
@ -172,8 +172,8 @@ async function chooseList(ev: MouseEvent): Promise<void> {
os.popupMenu(items, ev.currentTarget ?? ev.target); os.popupMenu(items, ev.currentTarget ?? ev.target);
} }
async function chooseAntenna(ev: MouseEvent): Promise<void> { const antennas = await os.api("antennas/list");
const antennas = await os.api("antennas/list"); function chooseAntenna(ev: MouseEvent) {
const items = [ const items = [
{ {
type: "link" as const, type: "link" as const,

7
packages/client/src/ui/_common_/navbar.vue
View File

@ -92,7 +92,12 @@
><i class="icon ph-door ph-bold ph-fw ph-lg"></i ><i class="icon ph-door ph-bold ph-fw ph-lg"></i
><span class="text">{{ i18n.ts.controlPanel }}</span> ><span class="text">{{ i18n.ts.controlPanel }}</span>
</MkA> </MkA>
<button v-click-anime class="item _button" @click="more"> <button
v-click-anime
v-tooltip.noDelay.right="i18n.ts.more"
class="item _button"
@click="more"
>
<i <i
class="icon ph-dots-three-outline ph-bold ph-fw ph-lg" class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"
></i ></i