oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge branch 'io' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-10-18 00:12:57 +09:00
commit 24d5f28dd9
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
8 changed files with 52 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/frontend/src/components/MkPostForm.vue
View file

@ -71,6 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="maxTextLength - textLength < 100" :class="['_acrylic', $style.textCount, { [$style.textOver]: textLength > maxTextLength }]">{{ maxTextLength - textLength }}</div>
</div>
<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
<MkInfo v-if="files.length > 0" warn :class="$style.guidelineInfo" :rounded="false"><Mfm :text="i18n.t('_postForm.guidelineInfo', { tosUrl: instance.tosUrl, nsfwGuideUrl })"/></MkInfo>
<XPostFormAttaches v-model="files" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName" @replaceFile="replaceFile"/>
<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
<MkNotePreview v-if="showPreview" :class="$style.preview" :text="text"/>
@ -188,6 +189,8 @@ let recentHashtags = $ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]')
let imeText = $ref('');
let showingOptions = $ref(false);
const nsfwGuideUrl = 'https://go.misskey.io/media-guideline';
const draftKey = $computed((): string => {
let key = props.channel ? `channel:${props.channel.id}` : '';
@ -1188,6 +1191,10 @@ defineExpose({
color: var(--accent);
}
.guidelineInfo {
margin-top: 8px;
}
@container (max-width: 500px) {
.headerRight {
font-size: .9em;