From 3c4cf5ed1169bba6d5d2e4be5769c34d7c06da48 Mon Sep 17 00:00:00 2001 From: shadowfacts Date: Thu, 31 Jan 2019 00:50:19 +0000 Subject: [PATCH 1/9] Only generate mentions string if there are mentions Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder. --- src/components/post_status_form/post_status_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 8a4e2489..88bc736f 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -16,7 +16,7 @@ const buildMentionsString = ({user, attentions}, currentUser) => { return `@${attention.screen_name}` }) - return mentions.join(' ') + ' ' + return mentions.length > 0 ? mentions.join(' ') + ' ' : '' } const PostStatusForm = { From 6a8d10f0bb37aa71eabd4aa8849cf2d8cada2ae1 Mon Sep 17 00:00:00 2001 From: Edijs Date: Wed, 30 Jan 2019 18:53:34 -0700 Subject: [PATCH 2/9] Fix statistics label visibility via configuration --- src/components/user_card_content/user_card_content.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 0e820182..d1034d68 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -107,18 +107,18 @@
-
+
{{ $t('user_card.statuses') }}
- {{user.statuses_count}}
+ {{user.statuses_count}}
{{ $t('user_card.followees') }}
- {{user.friends_count}} + {{user.friends_count}}
{{ $t('user_card.followers') }}
- {{user.followers_count}} + {{user.followers_count}}

From 476bf0afe1c890b0f08587b3942981c8c591c7be Mon Sep 17 00:00:00 2001 From: shpuld Date: Thu, 31 Jan 2019 17:00:31 +0200 Subject: [PATCH 3/9] Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher --- src/components/settings/settings.js | 2 +- .../style_switcher/style_switcher.js | 2 +- .../{tab_switcher.jsx => tab_switcher.js} | 12 +++-- src/components/user_profile/user_profile.vue | 48 ++++++++++++++++--- src/components/user_settings/user_settings.js | 2 +- .../user_settings/user_settings.vue | 2 +- 6 files changed, 52 insertions(+), 16 deletions(-) rename src/components/tab_switcher/{tab_switcher.jsx => tab_switcher.js} (85%) diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 06011e7c..7000fa5e 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -1,5 +1,5 @@ /* eslint-env browser */ -import TabSwitcher from '../tab_switcher/tab_switcher.jsx' +import TabSwitcher from '../tab_switcher/tab_switcher.js' import StyleSwitcher from '../style_switcher/style_switcher.vue' import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue' import { filter, trim } from 'lodash' diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 6a4e1cba..8c3d4861 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -7,7 +7,7 @@ import OpacityInput from '../opacity_input/opacity_input.vue' import ShadowControl from '../shadow_control/shadow_control.vue' import FontControl from '../font_control/font_control.vue' import ContrastRatio from '../contrast_ratio/contrast_ratio.vue' -import TabSwitcher from '../tab_switcher/tab_switcher.jsx' +import TabSwitcher from '../tab_switcher/tab_switcher.js' import Preview from './preview.vue' import ExportImport from '../export_import/export_import.vue' diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.js similarity index 85% rename from src/components/tab_switcher/tab_switcher.jsx rename to src/components/tab_switcher/tab_switcher.js index 9038733c..f9c3f927 100644 --- a/src/components/tab_switcher/tab_switcher.jsx +++ b/src/components/tab_switcher/tab_switcher.js @@ -4,6 +4,7 @@ import './tab_switcher.scss' export default Vue.component('tab-switcher', { name: 'TabSwitcher', + props: ['renderOnlyFocused'], data () { return { active: this.$slots.default.findIndex(_ => _.tag) @@ -44,11 +45,12 @@ export default Vue.component('tab-switcher', { const contents = this.$slots.default.map((slot, index) => { if (!slot.tag) return const active = index === this.active - return ( -
- {slot} -
- ) + if (this.renderOnlyFocused) { + return active + ?
{slot}
+ : + } + return
{slot}
}) return ( diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index f9b964ce..e53ce4cc 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -1,12 +1,28 @@