1
0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-23 16:05:09 +01:00
This commit is contained in:
Henry Jameson 2020-01-12 17:59:41 +02:00
parent 39dd08e694
commit 3492d7f81e
4 changed files with 13 additions and 13 deletions

View File

@ -13,8 +13,8 @@
v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
:checked="present"
:disabled="disabled"
@change="$emit('input', typeof value === 'undefined' ? fallback : undefined)"
class="opt"
@change="$emit('input', typeof value === 'undefined' ? fallback : undefined)"
/>
<div class="input color-input-field">
<input
@ -46,6 +46,9 @@
import Checkbox from '../checkbox/checkbox.vue'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
export default {
components: {
Checkbox
},
props: {
// Name of color, used for identifying
name: {
@ -83,9 +86,6 @@ export default {
default: true
}
},
components: {
Checkbox
},
computed: {
present () {
return typeof this.value !== 'undefined'

View File

@ -13,8 +13,8 @@
v-if="typeof fallback !== 'undefined'"
:checked="present"
:disabled="disabled"
@change="$emit('input', !present ? fallback : undefined)"
class="opt"
@change="$emit('input', !present ? fallback : undefined)"
/>
<input
:id="name"
@ -33,12 +33,12 @@
<script>
import Checkbox from '../checkbox/checkbox.vue'
export default {
props: [
'name', 'value', 'fallback', 'disabled'
],
components: {
Checkbox
},
props: [
'name', 'value', 'fallback', 'disabled'
],
computed: {
present () {
return typeof this.value !== 'undefined'

View File

@ -76,9 +76,9 @@
<li>
<Checkbox v-model="useStreamingApi">
{{ $t('settings.useStreamingApi') }}
<br/>
<br>
<small>
{{ $t('settings.useStreamingApiWarning') }}
{{ $t('settings.useStreamingApiWarning') }}
</small>
</Checkbox>
</li>

View File

@ -119,14 +119,14 @@
name="accentColor"
:fallback="previewTheme.colors.link"
:label="$t('settings.accent')"
:showOptionalTickbox="typeof linkColorLocal !== 'undefined'"
:show-optional-tickbox="typeof linkColorLocal !== 'undefined'"
/>
<ColorInput
v-model="linkColorLocal"
name="linkColor"
:fallback="previewTheme.colors.accent"
:label="$t('settings.links')"
:showOptionalTickbox="typeof accentColorLocal !== 'undefined'"
:show-optional-tickbox="typeof accentColorLocal !== 'undefined'"
/>
<ContrastRatio :contrast="previewContrast.bgLink" />
</div>
@ -388,7 +388,7 @@
v-model="underlayColorLocal"
name="underlay"
:label="$t('settings.style.advanced_colors.underlay')"
fallback='#000000'
fallback="#000000"
/>
<OpacityInput
v-model="underlayOpacityLocal"