From 0554cac113555b948cdad3d9f14ec6f548c93c01 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Wed, 27 Jun 2018 22:43:22 -0700 Subject: [PATCH 01/20] Add click-to-show content warnings on posts --- src/components/status/status.js | 6 +++++- src/components/status/status.vue | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 87ef90d8..9f88d38c 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -28,7 +28,8 @@ const Status = { userExpanded: false, preview: null, showPreview: false, - showingTall: false + showingTall: false, + showingContentWarningContent: false }), computed: { muteWords () { @@ -145,6 +146,9 @@ const Status = { toggleShowTall () { this.showingTall = !this.showingTall }, + toggleContentWarningContent () { + this.showingContentWarningContent = !this.showingContentWarningContent + }, replyEnter (id, event) { this.showPreview = true const targetId = Number(id) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f88c810d..cffa8e26 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -73,7 +73,16 @@
Show more -
+
+
+ + + +
+
+
Click to view this post.
+
+
Show less
@@ -488,4 +497,15 @@ a.unmute { } } +.hiddenContent { + margin: 8px; + padding: 32px; + background: var(--lightBg, $fallback--lightBg); + color: #CCCCCC; + border-radius: var(--panelRadius, $fallback--panelRadius); +} +.contentWarnedContent { + margin: 8px; +} + From b3e122d31f95c5a130ce7c41970984502798903c Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Wed, 27 Jun 2018 23:55:29 -0700 Subject: [PATCH 02/20] Carry forward content warnings in replies --- src/components/post_status_form/post_status_form.js | 6 ++++-- src/components/status/status.vue | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f4c6aca..4f6cee9c 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -24,7 +24,8 @@ const PostStatusForm = { 'replyTo', 'repliedUser', 'attentions', - 'messageScope' + 'messageScope', + 'parentSpoilerText' ], components: { MediaUpload @@ -50,7 +51,8 @@ const PostStatusForm = { newStatus: { status: statusText, files: [], - visibility: this.messageScope || 'public' + visibility: this.messageScope || 'public', + spoilerText: this.parentSpoilerText || null }, caret: 0 } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index cffa8e26..09e6b54d 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -105,7 +105,13 @@
- +
From 65edcaf4b95964f94abbd9420fd11fc36490dbb1 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Wed, 27 Jun 2018 23:55:57 -0700 Subject: [PATCH 03/20] Differentiate content warning block if it is on lightbg --- src/components/status/status.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 09e6b54d..5f6b987a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -506,9 +506,11 @@ a.unmute { .hiddenContent { margin: 8px; padding: 32px; - background: var(--lightBg, $fallback--lightBg); - color: #CCCCCC; - border-radius: var(--panelRadius, $fallback--panelRadius); + background: var(--lightBg, $fallback--lightBg); + border-radius: var(--panelRadius, $fallback--panelRadius); +} +.status-el_focused * .hiddenContent { + background: var(--bg, $fallback--bg); } .contentWarnedContent { margin: 8px; From ab86e87e85afa3db390503821165cece64c39a3a Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Thu, 28 Jun 2018 20:29:39 -0700 Subject: [PATCH 04/20] Also hide attachments behind clickthrough. --- src/components/status/status.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 5f6b987a..77a7904e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -80,13 +80,13 @@
-
Click to view this post.
+
Click to view this post. (has attachments)
Show less -
+
From b0cf050797702d6a7cc921c71b27cecb5ce234c6 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Thu, 28 Jun 2018 21:39:25 -0700 Subject: [PATCH 05/20] Add configuration option to enable click-through content warnings --- src/components/status/status.js | 7 +++++-- src/components/status/status.vue | 10 ++++++---- src/main.js | 4 +++- static/config.json | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 9f88d38c..4e242701 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -29,7 +29,7 @@ const Status = { preview: null, showPreview: false, showingTall: false, - showingContentWarningContent: false + showingContentWarningContent: false }), computed: { muteWords () { @@ -93,7 +93,10 @@ const Status = { return 'small' } return 'normal' - } + }, + clickThroughContentWarningsEnabled () { + return this.$store.state.config.clickThroughContentWarningsEnabled + }, }, components: { Attachment, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 77a7904e..2e33999a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -76,17 +76,19 @@
- - + + + +
-
+
Click to view this post. (has attachments)
Show less
-
+
diff --git a/src/main.js b/src/main.js index bacd7f6d..01ee7f75 100644 --- a/src/main.js +++ b/src/main.js @@ -89,7 +89,7 @@ window.fetch('/api/statusnet/config.json') window.fetch('/static/config.json') .then((res) => res.json()) .then((data) => { - const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled} = data + const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, clickThroughContentWarningsEnabled} = data store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'background', value: background }) store.dispatch('setOption', { name: 'logo', value: logo }) @@ -98,6 +98,8 @@ window.fetch('/static/config.json') store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink }) store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) + store.dispatch('setOption', { name: 'clickThroughContentWarningsEnabled', value: clickThroughContentWarningsEnabled }) + if (data['chatDisabled']) { store.dispatch('disableChat') } diff --git a/static/config.json b/static/config.json index 4dacfebe..4fdddf29 100644 --- a/static/config.json +++ b/static/config.json @@ -11,5 +11,6 @@ "whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}", "whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html", "showInstanceSpecificPanel": false, - "scopeOptionsEnabled": false + "scopeOptionsEnabled": true, + "clickThroughContentWarningsEnabled": true } From 158342fc394b7fded6e25b8cb40516ccaff6ac26 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Fri, 29 Jun 2018 00:10:17 -0700 Subject: [PATCH 06/20] Fix lint warnings --- src/components/status/status.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 4e242701..40786d94 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -29,7 +29,7 @@ const Status = { preview: null, showPreview: false, showingTall: false, - showingContentWarningContent: false + showingContentWarningContent: false }), computed: { muteWords () { @@ -96,7 +96,7 @@ const Status = { }, clickThroughContentWarningsEnabled () { return this.$store.state.config.clickThroughContentWarningsEnabled - }, + } }, components: { Attachment, From 17f6eb18e73a46c0268d9c7bc46f755ac5da1b6f Mon Sep 17 00:00:00 2001 From: lambda Date: Thu, 12 Jul 2018 07:20:39 +0000 Subject: [PATCH 07/20] Revert "Merge branch 'cw-clickthrough' into 'develop'" This reverts merge request !291 --- .../post_status_form/post_status_form.js | 6 ++-- src/components/status/status.js | 9 +---- src/components/status/status.vue | 36 ++----------------- src/main.js | 4 +-- static/config.json | 3 +- 5 files changed, 8 insertions(+), 50 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f6cee9c..4f4c6aca 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -24,8 +24,7 @@ const PostStatusForm = { 'replyTo', 'repliedUser', 'attentions', - 'messageScope', - 'parentSpoilerText' + 'messageScope' ], components: { MediaUpload @@ -51,8 +50,7 @@ const PostStatusForm = { newStatus: { status: statusText, files: [], - visibility: this.messageScope || 'public', - spoilerText: this.parentSpoilerText || null + visibility: this.messageScope || 'public' }, caret: 0 } diff --git a/src/components/status/status.js b/src/components/status/status.js index 40786d94..87ef90d8 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -28,8 +28,7 @@ const Status = { userExpanded: false, preview: null, showPreview: false, - showingTall: false, - showingContentWarningContent: false + showingTall: false }), computed: { muteWords () { @@ -93,9 +92,6 @@ const Status = { return 'small' } return 'normal' - }, - clickThroughContentWarningsEnabled () { - return this.$store.state.config.clickThroughContentWarningsEnabled } }, components: { @@ -149,9 +145,6 @@ const Status = { toggleShowTall () { this.showingTall = !this.showingTall }, - toggleContentWarningContent () { - this.showingContentWarningContent = !this.showingContentWarningContent - }, replyEnter (id, event) { this.showPreview = true const targetId = Number(id) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 2e33999a..f88c810d 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -73,22 +73,11 @@
Show more -
-
- - - - - -
-
-
Click to view this post. (has attachments)
-
-
+
Show less
-
+
@@ -107,13 +96,7 @@
- +
@@ -505,17 +488,4 @@ a.unmute { } } -.hiddenContent { - margin: 8px; - padding: 32px; - background: var(--lightBg, $fallback--lightBg); - border-radius: var(--panelRadius, $fallback--panelRadius); -} -.status-el_focused * .hiddenContent { - background: var(--bg, $fallback--bg); -} -.contentWarnedContent { - margin: 8px; -} - diff --git a/src/main.js b/src/main.js index 01ee7f75..bacd7f6d 100644 --- a/src/main.js +++ b/src/main.js @@ -89,7 +89,7 @@ window.fetch('/api/statusnet/config.json') window.fetch('/static/config.json') .then((res) => res.json()) .then((data) => { - const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, clickThroughContentWarningsEnabled} = data + const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled} = data store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'background', value: background }) store.dispatch('setOption', { name: 'logo', value: logo }) @@ -98,8 +98,6 @@ window.fetch('/static/config.json') store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink }) store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) - store.dispatch('setOption', { name: 'clickThroughContentWarningsEnabled', value: clickThroughContentWarningsEnabled }) - if (data['chatDisabled']) { store.dispatch('disableChat') } diff --git a/static/config.json b/static/config.json index 4fdddf29..4dacfebe 100644 --- a/static/config.json +++ b/static/config.json @@ -11,6 +11,5 @@ "whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}", "whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html", "showInstanceSpecificPanel": false, - "scopeOptionsEnabled": true, - "clickThroughContentWarningsEnabled": true + "scopeOptionsEnabled": false } From 3373d287012d66c642249bbe2da48febaa69b12e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 5 Aug 2018 09:18:04 +0300 Subject: [PATCH 08/20] Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are --- src/App.scss | 7 +++++++ src/components/style_switcher/style_switcher.vue | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/App.scss b/src/App.scss index f830a33b..2426b998 100644 --- a/src/App.scss +++ b/src/App.scss @@ -168,6 +168,13 @@ input, textarea, .select { } } +option { + color: $fallback--fg; + color: var(--fg, $fallback--fg); + background-color: $fallback--bg; + background-color: var(--bg, $fallback--bg); +} + i[class*=icon-] { color: $fallback--icon; color: var(--icon, $fallback--icon) diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 7acba1dc..112bbc1e 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -3,7 +3,10 @@
{{$t('settings.presets')}} From fd484a1a628c29bcd0bed6b68488ee28b5497fd0 Mon Sep 17 00:00:00 2001 From: Toromino Date: Sun, 5 Aug 2018 19:17:11 +0000 Subject: [PATCH 09/20] Textarea is now focused when replying --- src/components/post_status_form/post_status_form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f4c6aca..b1a1acb7 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -31,6 +31,10 @@ const PostStatusForm = { }, mounted () { this.resize(this.$refs.textarea) + + if (this.replyTo) { + this.$refs.textarea.focus() + } }, data () { const preset = this.$route.query.message From 88a81406e3feaa4241a7f76278b2c4b126e2496b Mon Sep 17 00:00:00 2001 From: Toromino Date: Sun, 5 Aug 2018 19:41:34 +0000 Subject: [PATCH 10/20] Remove trailing whitespace --- 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 b1a1acb7..dcb2c6e3 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -31,7 +31,7 @@ const PostStatusForm = { }, mounted () { this.resize(this.$refs.textarea) - + if (this.replyTo) { this.$refs.textarea.focus() } From d3d5a84868b1eaf9a0c8311a2df5b5c243434439 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 6 Aug 2018 07:58:34 +0300 Subject: [PATCH 11/20] Made it so that unfocused tab doesn't autostream posts when scrolled to the top --- src/components/timeline/timeline.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index f24626f9..5c179567 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -13,7 +13,8 @@ const Timeline = { ], data () { return { - paused: false + paused: false, + unfocused: false } }, computed: { @@ -65,8 +66,15 @@ const Timeline = { this.fetchFollowers() } }, + mounted () { + if (typeof document.hidden !== 'undefined') { + document.addEventListener('visibilitychange', this.handleVisibilityChange, false) + this.unfocused = document.hidden + } + }, destroyed () { window.removeEventListener('scroll', this.scrollLoad) + if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false) this.$store.commit('setLoading', { timeline: this.timelineName, value: false }) }, methods: { @@ -113,6 +121,9 @@ const Timeline = { (window.innerHeight + window.pageYOffset) >= (height - 750)) { this.fetchOlderStatuses() } + }, + handleVisibilityChange () { + this.unfocused = document.hidden } }, watch: { @@ -122,7 +133,7 @@ const Timeline = { } if (count > 0) { // only 'stream' them when you're scrolled to the top - if (window.pageYOffset < 15 && !this.paused) { + if (window.pageYOffset < 15 && !this.paused && !this.unfocused) { this.showNewStatuses() } else { this.paused = true From 976444064f19fbfc1a4085b421196f36d690d820 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 6 Aug 2018 09:45:22 +0300 Subject: [PATCH 12/20] Fixes broken custom emoji in autocomplete when proxying to remote BE --- src/components/post_status_form/post_status_form.js | 2 +- src/main.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f4c6aca..aa9cd160 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -91,7 +91,7 @@ const PostStatusForm = { screen_name: `:${shortcode}:`, name: '', utf: utf || '', - img: image_url, + img: utf ? '' : this.$store.state.config.server + image_url, highlighted: index === this.highlighted })) } else { diff --git a/src/main.js b/src/main.js index bacd7f6d..fa955063 100644 --- a/src/main.js +++ b/src/main.js @@ -79,11 +79,12 @@ const i18n = new VueI18n({ window.fetch('/api/statusnet/config.json') .then((res) => res.json()) .then((data) => { - const {name, closed: registrationClosed, textlimit} = data.site + const {name, closed: registrationClosed, textlimit, server} = data.site store.dispatch('setOption', { name: 'name', value: name }) store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') }) store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) }) + store.dispatch('setOption', { name: 'server', value: server }) }) window.fetch('/static/config.json') From d5efa10946239dc1c9e0aa646dc1238a2737c456 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 6 Aug 2018 09:52:07 +0300 Subject: [PATCH 13/20] hopefully, fix linter --- 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 aa9cd160..34c02325 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -87,10 +87,10 @@ const PostStatusForm = { return false } return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({ - // eslint-disable-next-line camelcase screen_name: `:${shortcode}:`, name: '', utf: utf || '', + // eslint-disable-next-line camelcase img: utf ? '' : this.$store.state.config.server + image_url, highlighted: index === this.highlighted })) From da36cd11e8e7b5a1cefafb71e622ebbeb494d8ae Mon Sep 17 00:00:00 2001 From: dtluna Date: Mon, 6 Aug 2018 11:57:27 +0300 Subject: [PATCH 14/20] Hide all status actions if not logged in --- src/components/status/status.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f88c810d..13fb9b7d 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -82,8 +82,8 @@
-
-
+
+
From 5cfc247c6b7f5dcdf7ef7e552d85f31615129eab Mon Sep 17 00:00:00 2001 From: dtluna Date: Mon, 6 Aug 2018 09:08:50 +0000 Subject: [PATCH 15/20] Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'" This reverts merge request !301 --- src/components/status/status.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 13fb9b7d..f88c810d 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -82,8 +82,8 @@
-
-
+
+
From e60fde233b50ee1b2ed273f49f3fc5831508143c Mon Sep 17 00:00:00 2001 From: Toromino Date: Wed, 8 Aug 2018 14:39:22 +0000 Subject: [PATCH 16/20] Update status.vue --- src/components/status/status.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f88c810d..11865d0f 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -88,7 +88,7 @@
- +
From 876f7633fe34039c6f25831fa63ecc55d99081ff Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 9 Aug 2018 12:52:34 +0300 Subject: [PATCH 17/20] Use serverside html rendering in usernames and bios if available. --- src/components/notification/notification.vue | 3 ++- src/components/status/status.js | 1 + src/components/status/status.vue | 6 ++++-- src/components/user_card/user_card.vue | 10 ++++++++-- src/components/user_card_content/user_card_content.vue | 6 ++++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index eed598a8..208e389c 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -10,7 +10,8 @@
- {{ notification.action.user.name }} + + {{ notification.action.user.name }} {{$t('notifications.favorited_you')}} diff --git a/src/components/status/status.js b/src/components/status/status.js index 87ef90d8..eb7d24d6 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -40,6 +40,7 @@ const Status = { }, retweet () { return !!this.statusoid.retweeted_status }, retweeter () { return this.statusoid.user.name }, + retweeterHtml () { return this.statusoid.user.name_html }, status () { if (this.retweet) { return this.statusoid.retweeted_status diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f88c810d..e49958aa 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -11,7 +11,8 @@
- {{retweeter}} + + {{retweeter}} {{$t('timeline.repeated')}}
@@ -30,7 +31,8 @@
-

{{status.user.name}}

+

+

{{status.user.name}}

{{status.user.screen_name}} diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 6478a65f..7e3e0afe 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -7,10 +7,16 @@
-
+
+ + + {{ $t('user_card.follows_you') }} + +
+
{{ user.name }} - {{ $t('user_card.follows_you') }} + {{ $t('user_card.follows_you') }}
@{{ user.screen_name }}
 diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 09e91271..96923786 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -13,7 +13,8 @@
-
{{user.name}}
+
+
{{user.name}}
@{{user.screen_name}} {{dailyAvg}} {{ $t('user_card.per_day') }} @@ -88,7 +89,8 @@ {{user.followers_count}}
-

{{user.description}}

+

+

{{ user.description }}

From 316692ee854fbd9b15f9838cf915966956ec8ca8 Mon Sep 17 00:00:00 2001 From: Toromino Date: Thu, 9 Aug 2018 16:45:52 +0000 Subject: [PATCH 18/20] Update retweet_button.vue --- src/components/retweet_button/retweet_button.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue index 1bee3d08..f5b00599 100644 --- a/src/components/retweet_button/retweet_button.vue +++ b/src/components/retweet_button/retweet_button.vue @@ -1,9 +1,9 @@