Merge remote-tracking branch 'origin/develop' into plain-bg

* origin/develop:
  fix remote follow button style
  Disable horizontal textarea resize
  Add uk.json in messages.js
  Display upload limit on the Features panel
  use title html for poll options before vote
  fix recent mistakes in react button
This commit is contained in:
Henry Jameson 2020-12-16 18:43:38 +02:00
commit 0cf06cb9ec
12 changed files with 24 additions and 9 deletions

View File

@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mouseover titles for emojis in reaction picker - Mouseover titles for emojis in reaction picker
- Support to input emoji into the search box in reaction picker - Support to input emoji into the search box in reaction picker
- Added some missing unicode emoji - Added some missing unicode emoji
- Added the upload limit to the Features panel in the About page
- Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
### Fixed ### Fixed
@ -19,11 +20,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fixed pinned statuses not appearing in user profiles - Fixed pinned statuses not appearing in user profiles
- Fixed some elements not being keyboard navigation friendly - Fixed some elements not being keyboard navigation friendly
- Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session - Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
- Fixed custom emoji not showing in poll options before voting
- Fixed link color not applied to instance name in topbar - Fixed link color not applied to instance name in topbar
### Changed ### Changed
- Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
- Made reply/fav/repeat etc buttons easier to hit - Made reply/fav/repeat etc buttons easier to hit
- Disabled horizontal textarea resize
- Wallpaper is now top-aligned, horizontally centered. - Wallpaper is now top-aligned, horizontally centered.

View File

@ -334,6 +334,10 @@ input, textarea, .select, .input {
box-sizing: border-box; box-sizing: border-box;
} }
} }
&.resize-height {
resize: vertical;
}
} }
option { option {

View File

@ -1,3 +1,5 @@
import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
const FeaturesPanel = { const FeaturesPanel = {
computed: { computed: {
chat: function () { return this.$store.state.instance.chatAvailable }, chat: function () { return this.$store.state.instance.chatAvailable },
@ -6,7 +8,8 @@ const FeaturesPanel = {
whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled }, whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable }, mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode }, minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode },
textlimit: function () { return this.$store.state.instance.textlimit } textlimit: function () { return this.$store.state.instance.textlimit },
uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) }
} }
} }

View File

@ -25,6 +25,7 @@
</li> </li>
<li>{{ $t('features_panel.scope_options') }}</li> <li>{{ $t('features_panel.scope_options') }}</li>
<li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li> <li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li>
<li>{{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}</li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@ -42,7 +42,8 @@
:value="index" :value="index"
> >
<label class="option-vote"> <label class="option-vote">
<div>{{ option.title }}</div> <!-- eslint-disable-next-line vue/no-v-html -->
<div v-html="option.title_html" />
</label> </label>
</div> </div>
</div> </div>

View File

@ -20,10 +20,10 @@
<div class="reaction-picker"> <div class="reaction-picker">
<span <span
v-for="emoji in commonEmojis" v-for="emoji in commonEmojis"
:key="emoji" :key="emoji.replacement"
class="emoji-button" class="emoji-button"
:title="emoji.displayText" :title="emoji.displayText"
@click="addReaction($event, emoji, close)" @click="addReaction($event, emoji.replacement, close)"
> >
{{ emoji.replacement }} {{ emoji.replacement }}
</span> </span>

View File

@ -16,7 +16,7 @@
> >
<button <button
click="submit" click="submit"
class="remote-button" class="button-default remote-button"
> >
{{ $t('user_card.remote_follow') }} {{ $t('user_card.remote_follow') }}
</button> </button>

View File

@ -75,6 +75,7 @@
<p>{{ $t('settings.filtering_explanation') }}</p> <p>{{ $t('settings.filtering_explanation') }}</p>
<textarea <textarea
id="muteWords" id="muteWords"
class="resize-height"
v-model="muteWordsString" v-model="muteWordsString"
/> />
</div> </div>

View File

@ -11,7 +11,7 @@
<input <input
id="username" id="username"
v-model="newName" v-model="newName"
classname="name-changer" class="name-changer"
> >
</EmojiInput> </EmojiInput>
<p>{{ $t('settings.bio') }}</p> <p>{{ $t('settings.bio') }}</p>
@ -22,7 +22,7 @@
> >
<textarea <textarea
v-model="newBio" v-model="newBio"
classname="bio" class="bio resize-height"
/> />
</EmojiInput> </EmojiInput>
<p> <p>

View File

@ -50,7 +50,8 @@
"scope_options": "Scope options", "scope_options": "Scope options",
"text_limit": "Text limit", "text_limit": "Text limit",
"title": "Features", "title": "Features",
"who_to_follow": "Who to follow" "who_to_follow": "Who to follow",
"upload_limit": "Upload limit"
}, },
"finder": { "finder": {
"error_fetching_user": "Error fetching user", "error_fetching_user": "Error fetching user",

View File

@ -33,6 +33,7 @@ const loaders = {
ro: () => import('./ro.json'), ro: () => import('./ro.json'),
ru: () => import('./ru.json'), ru: () => import('./ru.json'),
te: () => import('./te.json'), te: () => import('./te.json'),
uk: () => import('./uk.json'),
zh: () => import('./zh.json') zh: () => import('./zh.json')
} }

View File

@ -280,7 +280,7 @@ export const parseStatus = (data) => {
if (output.poll) { if (output.poll) {
output.poll.options = (output.poll.options || []).map(field => ({ output.poll.options = (output.poll.options || []).map(field => ({
...field, ...field,
title_html: addEmojis(field.title, data.emojis) title_html: addEmojis(escape(field.title), data.emojis)
})) }))
} }
output.pinned = data.pinned output.pinned = data.pinned