hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'appearance-tab' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2024-07-21 23:50:13 +03:00
commit 837f53a5c1
9 changed files with 76 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/font_control/font_control.js
View file

@ -50,10 +50,10 @@ export default {
return typeof this.modelValue !== 'undefined'
},
localFontsList () {
return this.$store.state.interface.localFonts?.values()
return this.$store.state.interface.localFonts
},
localFontsSize () {
return this.$store.state.interface.localFonts?.size
return this.$store.state.interface.localFonts?.length
}
}
}

4
src/components/font_control/font_control.vue
View file

@ -82,9 +82,9 @@
</button>
<Select
:id="name + '-local-font-switcher'"
:model-value="modelValue.family"
:model-value="modelValue?.family"
class="custom-font"
@update:modelValue="$emit('update:modelValue', { ...(modelValue || {}), family: $event.target.value })"
@update:modelValue="v => $emit('update:modelValue', { ...(modelValue || {}), family: v })"
>
<optgroup
:label="$t('settings.style.themes3.font.group-builtin')"

2
src/components/settings_modal/helpers/unit_setting.vue
View file

@ -13,7 +13,7 @@
:id="path"
class="input number-input"
type="number"
step="step"
:step="step"
:disabled="disabled"
:min="min || 0"
:value="stateValue"

14
src/components/settings_modal/tabs/appearance_tab.js
View file

@ -151,9 +151,21 @@ const AppearanceTab = {
...SharedComputedObject()
},
methods: {
updateFont (key, value) {
console.log(key, value)
this.$store.dispatch('setOption', {
name: 'theme3hacks',
value: {
...this.mergedConfig.theme3hacks,
fonts: {
...this.mergedConfig.theme3hacks.fonts,
[key]: value
}
}
})
},
isThemeActive (key) {
const { theme } = this.mergedConfig
console.log(key, theme)
return key === theme
},
setTheme (name) {

18
src/components/settings_modal/tabs/appearance_tab.vue
View file

@ -73,42 +73,42 @@
<ul class="setting-list">
<li>
<FontControl
:model-value="fontsOverride.interface"
:model-value="mergedConfig.theme3hacks.fonts.interface"
name="ui"
:label="$t('settings.style.fonts.components.interface')"
:fallback="{ family: 'sans-serif' }"
no-inherit="1"
@update:modelValue="v => $store.dispatch('setOption', { name: 'fontsOverride', value: { ...fontsOverride, interface: v } })"
@update:modelValue="v => updateFont('interface', v)"
/>
</li>
<li>
<FontControl
v-if="expertLevel > 0"
:model-value="fontsOverride.input"
:model-value="mergedConfig.theme3hacks.fonts.input"
name="input"
:fallback="{ family: 'inherit' }"
:label="$t('settings.style.fonts.components.input')"
@update:modelValue="v => $store.dispatch('setOption', { name: 'fontsOverride', value: { ...fontsOverride, input: v } })"
@update:modelValue="v => updateFont('input', v)"
/>
</li>
<li>
<FontControl
v-if="expertLevel > 0"
:model-value="fontsOverride.post"
:model-value="mergedConfig.theme3hacks.fonts.post"
name="post"
:fallback="{ family: 'inherit' }"
:label="$t('settings.style.fonts.components.post')"
@update:modelValue="v => $store.dispatch('setOption', { name: 'fontsOverride', value: { ...fontsOverride, post: v } })"
@update:modelValue="v => updateFont('post', v)"
/>
</li>
<li>
<FontControl
v-if="expertLevel > 0"
:model-value="fontsOverride.postCode"
:model-value="mergedConfig.theme3hacks.fonts.monospace"
name="postCode"
:fallback="{ family: 'monospace' }"
:label="$t('settings.style.fonts.components.postCode')"
@update:modelValue="v => $store.dispatch('setOption', { name: 'fontsOverride', value: { ...fontsOverride, postCode: v } })"
:label="$t('settings.style.fonts.components.monospace')"
@update:modelValue="v => updateFont('monospace', v)"
/>
</li>
</ul>