Merge branch 'develop' into feat/focus-input-with-emoji-pickers

This commit is contained in:
Shpuld Shpuldson 2021-02-25 17:31:36 +02:00
commit 74caf42ed7
10 changed files with 31 additions and 31 deletions

View file

@ -9,8 +9,8 @@
<button
v-if="!hideEmojiButton"
class="button-unstyled emoji-picker-icon"
@click.prevent="togglePicker"
type="button"
@click.prevent="togglePicker"
>
<FAIcon :icon="['far', 'smile-beam']" />
</button>

View file

@ -25,16 +25,16 @@
<div>
<button
class="button-unstyled -link"
@click.prevent="requireTOTP"
type="button"
@click.prevent="requireTOTP"
>
{{ $t('login.enter_two_factor_code') }}
</button>
<br>
<button
class="button-unstyled -link"
@click.prevent="abortMFA"
type="button"
@click.prevent="abortMFA"
>
{{ $t('general.cancel') }}
</button>

View file

@ -27,16 +27,16 @@
<div>
<button
class="button-unstyled -link"
@click.prevent="requireRecovery"
type="button"
@click.prevent="requireRecovery"
>
{{ $t('login.enter_recovery_code') }}
</button>
<br>
<button
class="button-unstyled -link"
@click.prevent="abortMFA"
type="button"
@click.prevent="abortMFA"
>
{{ $t('general.cancel') }}
</button>

View file

@ -6,8 +6,8 @@
<button
ref="trigger"
class="button-unstyled -fullwidth popover-trigger-button"
@click="onClick"
type="button"
@click="onClick"
>
<slot name="trigger" />
</button>

View file

@ -8,8 +8,8 @@
class="button-unstyled scope"
:class="css.direct"
:title="$t('post_status.scope.direct')"
@click="changeVis('direct')"
type="button"
@click="changeVis('direct')"
>
<FAIcon
icon="envelope"
@ -21,8 +21,8 @@
class="button-unstyled scope"
:class="css.private"
:title="$t('post_status.scope.private')"
@click="changeVis('private')"
type="button"
@click="changeVis('private')"
>
<FAIcon
icon="lock"
@ -34,8 +34,8 @@
class="button-unstyled scope"
:class="css.unlisted"
:title="$t('post_status.scope.unlisted')"
@click="changeVis('unlisted')"
type="button"
@click="changeVis('unlisted')"
>
<FAIcon
icon="lock-open"
@ -47,8 +47,8 @@
class="button-unstyled scope"
:class="css.public"
:title="$t('post_status.scope.public')"
@click="changeVis('public')"
type="button"
@click="changeVis('public')"
>
<FAIcon
icon="globe"

View file

@ -15,8 +15,8 @@
>
<button
class="btn button-default search-button"
@click="newQuery(searchTerm)"
type="submit"
@click="newQuery(searchTerm)"
>
<FAIcon icon="search" />
</button>

View file

@ -7,8 +7,8 @@
v-if="hidden"
class="button-unstyled nav-icon"
:title="$t('nav.search')"
@click.prevent.stop="toggleHidden"
type="button"
@click.prevent.stop="toggleHidden"
>
<FAIcon
fixed-width
@ -28,8 +28,8 @@
>
<button
class="button-default search-button"
@click="find(searchTerm)"
type="submit"
@click="find(searchTerm)"
>
<FAIcon
fixed-width
@ -38,8 +38,8 @@
</button>
<button
class="button-unstyled cancel-search"
@click.prevent.stop="toggleHidden"
type="button"
@click.prevent.stop="toggleHidden"
>
<FAIcon
fixed-width

View file

@ -4,13 +4,13 @@
>
<Checkbox
:checked="state"
@change="update"
:disabled="disabled"
@change="update"
>
<span
v-if="!!$slots.default"
class="label"
>
>
<slot />
</span>
<ModifiedIndicator :changed="isChanged" />
@ -23,14 +23,14 @@ import { get, set } from 'lodash'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import ModifiedIndicator from './modified_indicator.vue'
export default {
props: [
'path',
'disabled'
],
components: {
Checkbox,
ModifiedIndicator
},
props: [
'path',
'disabled'
],
computed: {
pathDefault () {
const [firstSegment, ...rest] = this.path.split('.')

View file

@ -2,21 +2,21 @@
<span
v-if="changed"
class="ModifiedIndicator"
>
>
<Popover
trigger="hover"
>
>
<span slot="trigger">
&nbsp;
<FAIcon
icon="wrench"
/>
<FAIcon
icon="wrench"
/>
</span>
<div
class="modified-tooltip"
slot="content"
>
{{ $t('settings.setting_changed') }}
class="modified-tooltip"
>
{{ $t('settings.setting_changed') }}
</div>
</Popover>
</span>
@ -32,8 +32,8 @@ library.add(
)
export default {
props: ['changed'],
components: { Popover }
components: { Popover },
props: ['changed']
}
</script>

View file

@ -75,8 +75,8 @@
<p>{{ $t('settings.filtering_explanation') }}</p>
<textarea
id="muteWords"
class="resize-height"
v-model="muteWordsString"
class="resize-height"
/>
</div>
<div>