Merge branch 'fix/fix-vue-errors' into 'develop'
fix vue warnings and errors See merge request pleroma/pleroma-fe!1230
This commit is contained in:
commit
679a1f5e1c
@ -39,13 +39,16 @@
|
|||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
large: {
|
large: {
|
||||||
required: false
|
required: false,
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
},
|
},
|
||||||
// TODO: Make theme switcher compute theme initially so that contrast
|
// TODO: Make theme switcher compute theme initially so that contrast
|
||||||
// component won't be called without contrast data
|
// component won't be called without contrast data
|
||||||
contrast: {
|
contrast: {
|
||||||
required: false,
|
required: false,
|
||||||
type: Object
|
type: Object,
|
||||||
|
default: () => ({})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
<span class="result-percentage">
|
<span class="result-percentage">
|
||||||
{{ percentageForOption(option.votes_count) }}%
|
{{ percentageForOption(option.votes_count) }}%
|
||||||
</span>
|
</span>
|
||||||
|
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||||
<span v-html="option.title_html" />
|
<span v-html="option.title_html" />
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
|
@ -278,7 +278,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.alertErrorText"
|
:contrast="previewContrast.alertErrorText"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="alertWarningColorLocal"
|
v-model="alertWarningColorLocal"
|
||||||
@ -294,7 +294,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.alertWarningText"
|
:contrast="previewContrast.alertWarningText"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="alertNeutralColorLocal"
|
v-model="alertNeutralColorLocal"
|
||||||
@ -310,7 +310,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.alertNeutralText"
|
:contrast="previewContrast.alertNeutralText"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
<OpacityInput
|
<OpacityInput
|
||||||
v-model="alertOpacityLocal"
|
v-model="alertOpacityLocal"
|
||||||
@ -334,7 +334,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.badgeNotificationText"
|
:contrast="previewContrast.badgeNotificationText"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="color-item">
|
<div class="color-item">
|
||||||
@ -359,7 +359,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.panelText"
|
:contrast="previewContrast.panelText"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="panelLinkColorLocal"
|
v-model="panelLinkColorLocal"
|
||||||
@ -369,7 +369,7 @@
|
|||||||
/>
|
/>
|
||||||
<ContrastRatio
|
<ContrastRatio
|
||||||
:contrast="previewContrast.panelLink"
|
:contrast="previewContrast.panelLink"
|
||||||
large="true"
|
large
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="color-item">
|
<div class="color-item">
|
||||||
@ -740,57 +740,57 @@
|
|||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatBgColorLocal"
|
v-model="chatBgColorLocal"
|
||||||
name="chatBgColor"
|
name="chatBgColor"
|
||||||
:fallback="previewTheme.colors.bg || 1"
|
:fallback="previewTheme.colors.bg"
|
||||||
:label="$t('settings.background')"
|
:label="$t('settings.background')"
|
||||||
/>
|
/>
|
||||||
<h5>{{ $t('settings.style.advanced_colors.chat.incoming') }}</h5>
|
<h5>{{ $t('settings.style.advanced_colors.chat.incoming') }}</h5>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageIncomingBgColorLocal"
|
v-model="chatMessageIncomingBgColorLocal"
|
||||||
name="chatMessageIncomingBgColor"
|
name="chatMessageIncomingBgColor"
|
||||||
:fallback="previewTheme.colors.bg || 1"
|
:fallback="previewTheme.colors.bg"
|
||||||
:label="$t('settings.background')"
|
:label="$t('settings.background')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageIncomingTextColorLocal"
|
v-model="chatMessageIncomingTextColorLocal"
|
||||||
name="chatMessageIncomingTextColor"
|
name="chatMessageIncomingTextColor"
|
||||||
:fallback="previewTheme.colors.text || 1"
|
:fallback="previewTheme.colors.text"
|
||||||
:label="$t('settings.text')"
|
:label="$t('settings.text')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageIncomingLinkColorLocal"
|
v-model="chatMessageIncomingLinkColorLocal"
|
||||||
name="chatMessageIncomingLinkColor"
|
name="chatMessageIncomingLinkColor"
|
||||||
:fallback="previewTheme.colors.link || 1"
|
:fallback="previewTheme.colors.link"
|
||||||
:label="$t('settings.links')"
|
:label="$t('settings.links')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageIncomingBorderColorLocal"
|
v-model="chatMessageIncomingBorderColorLocal"
|
||||||
name="chatMessageIncomingBorderLinkColor"
|
name="chatMessageIncomingBorderLinkColor"
|
||||||
:fallback="previewTheme.colors.fg || 1"
|
:fallback="previewTheme.colors.fg"
|
||||||
:label="$t('settings.style.advanced_colors.chat.border')"
|
:label="$t('settings.style.advanced_colors.chat.border')"
|
||||||
/>
|
/>
|
||||||
<h5>{{ $t('settings.style.advanced_colors.chat.outgoing') }}</h5>
|
<h5>{{ $t('settings.style.advanced_colors.chat.outgoing') }}</h5>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageOutgoingBgColorLocal"
|
v-model="chatMessageOutgoingBgColorLocal"
|
||||||
name="chatMessageOutgoingBgColor"
|
name="chatMessageOutgoingBgColor"
|
||||||
:fallback="previewTheme.colors.bg || 1"
|
:fallback="previewTheme.colors.bg"
|
||||||
:label="$t('settings.background')"
|
:label="$t('settings.background')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageOutgoingTextColorLocal"
|
v-model="chatMessageOutgoingTextColorLocal"
|
||||||
name="chatMessageOutgoingTextColor"
|
name="chatMessageOutgoingTextColor"
|
||||||
:fallback="previewTheme.colors.text || 1"
|
:fallback="previewTheme.colors.text"
|
||||||
:label="$t('settings.text')"
|
:label="$t('settings.text')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageOutgoingLinkColorLocal"
|
v-model="chatMessageOutgoingLinkColorLocal"
|
||||||
name="chatMessageOutgoingLinkColor"
|
name="chatMessageOutgoingLinkColor"
|
||||||
:fallback="previewTheme.colors.link || 1"
|
:fallback="previewTheme.colors.link"
|
||||||
:label="$t('settings.links')"
|
:label="$t('settings.links')"
|
||||||
/>
|
/>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
v-model="chatMessageOutgoingBorderColorLocal"
|
v-model="chatMessageOutgoingBorderColorLocal"
|
||||||
name="chatMessageOutgoingBorderLinkColor"
|
name="chatMessageOutgoingBorderLinkColor"
|
||||||
:fallback="previewTheme.colors.bg || 1"
|
:fallback="previewTheme.colors.bg"
|
||||||
:label="$t('settings.style.advanced_colors.chat.border')"
|
:label="$t('settings.style.advanced_colors.chat.border')"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user