Compare commits

..

No commits in common. "b5206d1b3b6c5a34679c2b43b73cf6bc11e9361d" and "d55595d7f50bf0db41ae98aadd1e8c71f3b2f39f" have entirely different histories.

7 changed files with 27 additions and 28 deletions

View file

@ -61,16 +61,15 @@
</div>
<p
v-if="error"
class="alert error"
class="alert error notice-dismissible"
>
<span>{{ error }}</span>
<button
<a
class="fa-scale-110 fa-old-padding dismiss"
type="button"
@click.prevent="dismissError()"
>
<FAIcon icon="times" />
</button>
</a>
</p>
</div>
</form>
@ -118,6 +117,10 @@
margin: 0.3em 0 1em;
}
.notice-dismissible {
padding-right: 2rem;
}
.dismiss {
cursor: pointer;
}

View file

@ -9,22 +9,20 @@
@dragover.prevent="fileDrag"
>
<div class="form-group">
<div class="visibility-notice notice-dismissible">
<i18n-t
v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
keypath="post_status.account_not_locked_warning"
tag="p"
class=""
scope="global"
<i18n-t
v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
keypath="post_status.account_not_locked_warning"
tag="p"
class="visibility-notice notice-dismissible"
scope="global"
>
<button
class="button-unstyled -link"
@click="openProfileTab"
>
<button
class="button-unstyled -link"
@click="openProfileTab"
>
{{ $t('post_status.account_not_locked_warning_link') }}
</button>
</i18n-t>
</div>
{{ $t('post_status.account_not_locked_warning_link') }}
</button>
</i18n-t>
<p
v-if="!hideScopeNotice && newStatus.visibility === 'public'"
class="visibility-notice notice-dismissible"

View file

@ -10,13 +10,12 @@
class="alert error"
>
{{ error }}
<button
<span
class="fa-scale-110 fa-old-padding"
type="button"
@click="clearError"
>
<FAIcon icon="times" />
</button>
</span>
</div>
<template v-if="muted && !isPreview">
<div class="status-container muted">

View file

@ -88,7 +88,7 @@
<StatusBookmarkFolderMenu
v-if="button.name === 'bookmark'"
:status="status"
@close="() => { close(); outerClose?.() }"
@close="() => { close(); outerClose() }"
/>
</template>
</Popover>

View file

@ -372,8 +372,8 @@ export const parseStatus = (data) => {
const quoteData = quoteRaw ? parseStatus(quoteRaw) : undefined
output.quote = quoteData
output.quote_id =
data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma?.quote_id
output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma?.quote_url
data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma.quote_id
output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma.quote_url
output.in_reply_to_status_id = data.in_reply_to_id
output.in_reply_to_user_id = data.in_reply_to_account_id

View file

@ -2,7 +2,7 @@ import { hex2rgb } from '../color_convert/color_convert.js'
const highlightStyle = (prefs) => {
if (prefs === undefined) return
const { color = '#FFFFFF', type } = prefs
const { color, type } = prefs
if (typeof color !== 'string') return
const rgb = hex2rgb(color)
if (rgb == null) return

View file

@ -91,8 +91,7 @@ export const useInterfaceStore = defineStore('interface', {
},
setPageTitle(option = '') {
try {
console.log('TITLE', option, useInstanceStore().instanceIdentity.name)
document.title = `${option} ${useInstanceStore().instanceIdentity.name}`
document.title = `${option} ${useInstanceStore().name}`
} catch (error) {
console.error(`${error}`)
}