161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 20:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Freeplay 2023-06-02 18:14:43 -04:00
commit 6b0e582bd8
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CODE_OF_CONDUCT.md
View File

@ -59,7 +59,7 @@ representative at an online or offline event.
## Enforcement
Servers of abusive, harassing, or otherwise unacceptable behavior may be
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
@thatonecalculator on Codeberg,
`@kainoa@calckey.social` on the Fediverse,

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

@ -68,7 +68,9 @@
class="article"
@contextmenu.stop="onContextmenu"
@click="noteClick"
:style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }"
:style="{
cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
}"
>
<div class="main">
<div class="header-container">
@ -503,7 +505,11 @@ function scrollIntoView() {
}
function noteClick(e) {
if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) {
if (
document.getSelection().type === "Range" ||
props.detailedView ||
!expandOnNoteClick
) {
e.stopPropagation();
} else {
router.push(notePage(appearNote));

3
packages/client/src/components/MkNoteSub.vue
View File

@ -14,7 +14,8 @@
@contextmenu.stop="onContextmenu"
>
<div v-if="conversation && depth > 1" class="line"></div>
<div class="main"
<div
class="main"
@click="noteClick"
:style="{ cursor: expandOnNoteClick ? 'pointer' : '' }"
>

3
packages/client/src/os.ts
View File

@ -277,6 +277,9 @@ export function alert(props: {
text?: string | null;
}): Promise<void> {
return new Promise((resolve, reject) => {
if (props.text == null && props.type === "error") {
props.text = "An unknown error occured!";
}
popup(
MkDialog,
props,

3
packages/client/src/pages/about-calckey.vue
View File

@ -98,8 +98,7 @@
:text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
/></FormLink>
<FormLink to="/@april@calckey.social"
><Mfm
:text="'@april@calckey.social (Backend)'"
><Mfm :text="'@april@calckey.social (Backend)'"
/></FormLink>
<FormLink to="/@freeplay@calckey.social"
><Mfm

8
packages/client/src/pages/settings/general.vue
View File

@ -54,9 +54,11 @@
<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
i18n.ts.disablePagesScript
}}</FormSwitch>
<FormSwitch v-model="expandOnNoteClick" class="_formBlock">{{
i18n.ts.expandOnNoteClick
}}<template #caption>{{ i18n.ts.expandOnNoteClickDesc }}</template>
<FormSwitch v-model="expandOnNoteClick" class="_formBlock"
>{{ i18n.ts.expandOnNoteClick
}}<template #caption>{{
i18n.ts.expandOnNoteClickDesc
}}</template>
</FormSwitch>
<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
>{{ i18n.ts.flagShowTimelineReplies