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

Merge branch 'smallfixes' into 'develop'

Browse source 
Small fixes

See merge request pleroma/pleroma-fe!2179
This commit is contained in:
HJ 2025-06-25 19:13:55 +00:00
commit 0a8d7ea659
6 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/small-fixes.skip Normal file
View file

1
index.html
View file

@ -135,6 +135,7 @@
</style> </style>
<style id="pleroma-eager-styles" type="text/css"></style> <style id="pleroma-eager-styles" type="text/css"></style>
<style id="pleroma-lazy-styles" type="text/css"></style> <style id="pleroma-lazy-styles" type="text/css"></style>
<style id="theme-holder" type="text/css"></style>
<!--server-generated-meta--> <!--server-generated-meta-->
</head> </head>
<body style="margin: 0; padding: 0"> <body style="margin: 0; padding: 0">

2
src/components/color_input/color_input.vue
View file

@ -26,7 +26,7 @@
class="textColor unstyled" class="textColor unstyled"
:class="{ disabled: !present || disabled }" :class="{ disabled: !present || disabled }"
type="text" type="text"
:value="modelValue || fallback" :value="modelValue ?? fallback"
:disabled="!present || disabled" :disabled="!present || disabled"
@input="updateValue($event.target.value)" @input="updateValue($event.target.value)"
> >

5
src/components/settings_modal/tabs/style_tab/style_tab.js
View file

@ -372,6 +372,9 @@ export default {
const path = getPath(component, directive) const path = getPath(component, directive)
usedRule = get(real, path) // get real usedRule = get(real, path) // get real
if (usedRule === '') {
return usedRule
}
if (!usedRule) { if (!usedRule) {
usedRule = get(fallback, path) usedRule = get(fallback, path)
} }
@ -379,7 +382,7 @@ export default {
return postProcess(usedRule) return postProcess(usedRule)
}, },
set (value) { set (value) {
if (value) { if (value != null) {
set(allEditedRules.value, getPath(component, directive), value) set(allEditedRules.value, getPath(component, directive), value)
} else { } else {
unset(allEditedRules.value, getPath(component, directive)) unset(allEditedRules.value, getPath(component, directive))

2
src/components/status_body/status_body.scss
View file

@ -180,11 +180,11 @@
line-height: inherit; line-height: inherit;
margin: 0; margin: 0;
border: none; border: none;
display: inline-block;
} }
.text-wrapper { .text-wrapper {
display: inline-block; display: inline-block;
width: 100%;
} }
} }
} }

2
src/services/style_setter/style_setter.js
View file

@ -242,7 +242,7 @@ export const applyConfig = (input) => {
.map(([k, v]) => `--${k}: ${v}`).join(';') .map(([k, v]) => `--${k}: ${v}`).join(';')
document.getElementById('style-config')?.remove() document.getElementById('style-config')?.remove()
const styleEl = document.createElement('style') const styleEl = document.getElementById('theme-holder')
styleEl.id = 'style-config' styleEl.id = 'style-config'
head.appendChild(styleEl) head.appendChild(styleEl)
const styleSheet = styleEl.sheet const styleSheet = styleEl.sheet