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

Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2024-09-26 01:13:06 +03:00
commit 7bf3cce917
24 changed files with 819 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/alert.style.js
View file

@ -27,7 +27,9 @@ export default {
component: 'Alert'
},
component: 'Border',
textColor: '--parent'
directives: {
textColor: '--parent'
}
},
{
variant: 'error',

4
src/components/button.style.js
View file

@ -34,8 +34,8 @@ export default {
directives: {
'--defaultButtonHoverGlow': 'shadow | 0 0 4 --text',
'--defaultButtonShadow': 'shadow | 0 0 2 #000000',
'--defaultButtonBevel': 'shadow | $borderSide(#FFFFFF, top, 0.2) | $borderSide(#000000, bottom, 0.2)',
'--pressedButtonBevel': 'shadow | $borderSide(#FFFFFF, bottom, 0.2)| $borderSide(#000000, top, 0.2)'
'--defaultButtonBevel': 'shadow | $borderSide(#FFFFFF, top, 0.2), $borderSide(#000000, bottom, 0.2)',
'--pressedButtonBevel': 'shadow | $borderSide(#FFFFFF, bottom, 0.2), $borderSide(#000000, top, 0.2)'
}
},
{

2
src/components/input.style.js
View file

@ -27,7 +27,7 @@ export default {
{
component: 'Root',
directives: {
'--defaultInputBevel': 'shadow | $borderSide(#FFFFFF, bottom, 0.2)| $borderSide(#000000, top, 0.2)'
'--defaultInputBevel': 'shadow | $borderSide(#FFFFFF, bottom, 0.2), $borderSide(#000000, top, 0.2)'
}
},
{

7
src/components/poll/poll.vue
View file

@ -76,6 +76,13 @@
>
{{ $t('polls.vote') }}
</button>
<span
v-if="poll.pleroma?.non_anonymous"
:title="$t('polls.non_anonymous_title')"
>
{{ $t('polls.non_anonymous') }}
&nbsp;·&nbsp;
</span>
<div class="total">
<template v-if="typeof poll.voters_count === 'number'">
{{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}

10
src/components/settings_modal/tabs/general_tab.vue
View file

@ -230,12 +230,14 @@
v-if="mergedConfig.useAbsoluteTimeFormat"
>
<li>
<IntegerSetting
path="absoluteTimeFormatMinAgeDays"
<UnitSetting
path="absoluteTimeFormatMinAge"
unit-set="time"
:units="['s', 'm', 'h', 'd']"
:min="0"
>
{{ $t('settings.absolute_time_format_min_age_days') }}
</IntegerSetting>
{{ $t('settings.absolute_time_format_min_age') }}
</UnitSetting>
</li>
</ul>
<h3>{{ $t('settings.attachments') }}</h3>

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

@ -26,7 +26,7 @@ export default {
if (!this.$store.getters.mergedConfig.useAbsoluteTimeFormat) {
return false
}
return this.$store.getters.mergedConfig.absoluteTimeFormatMinAgeDays * DateUtils.DAY <= this.relativeTimeMs
return DateUtils.durationStrToMs(this.$store.getters.mergedConfig.absoluteTimeFormatMinAge) <= this.relativeTimeMs
},
browserLocale () {
return localeService.internalToBrowserLocale(this.$i18n.locale)