From 92585f948e345bb57ead1bb2f6f53131f5faf0de Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 17:40:26 +0900 Subject: [PATCH 1/5] refs #116 Open account profile when click reblogger --- src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue index 78aca4f7be..bf4b29fa36 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue @@ -18,7 +18,7 @@ -
+
@@ -215,6 +215,7 @@ function findLink (target) { .reblogger { color: #909399; + cursor: pointer; .reblogger-icon { img { From aac7c33a99335eefa511f51b1681bfa1a0cc545b Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 17:45:20 +0900 Subject: [PATCH 2/5] refs #116 Open account profile when click favourite user --- .../Contents/Cards/Notification/Favourite.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue index cc124ec646..77f126a54b 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue @@ -5,7 +5,7 @@
- {{ username(message.account) }} favourited your status + {{ username(message.account) }} favourited your status
@@ -13,12 +13,12 @@
-
+
-
+
{{ username(message.status.account) }}
@@ -56,6 +56,11 @@ export default { if (link !== null) { shell.openExternal(link) } + }, + openUser (account) { + this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent') + this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account) + this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true) } } } @@ -103,6 +108,10 @@ function findLink (target) { margin-left: 10px; font-size: 14px; float: left; + + .bold { + cursor: pointer; + } } .action-icon { @@ -121,6 +130,7 @@ function findLink (target) { .icon { float: left; width: 42px; + cursor: pointer; img { width: 32px; @@ -137,6 +147,7 @@ function findLink (target) { .user { float: left; font-size: 14px; + cursor: pointer; } .timestamp { From 246ce3aed3038e81829a48e23f713d43d36bd626 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 17:47:45 +0900 Subject: [PATCH 3/5] refs #116 Open account profile when click follow user --- .../Contents/Cards/Notification/Follow.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue index 8f2d5caa95..df6ed18f9a 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue @@ -5,7 +5,7 @@
- {{ username(message.account) }} is now following you + {{ username(message.account) }} is now following you
@@ -27,6 +27,11 @@ export default { } else { return account.username } + }, + openUser (account) { + this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent') + this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account) + this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true) } } } @@ -61,6 +66,10 @@ export default { margin-left: 10px; font-size: 14px; float: left; + + .bold { + cursor: pointer; + } } .action-icon { From 57697385d1aeca3138027726d17cd89216cbf378 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 17:50:21 +0900 Subject: [PATCH 4/5] refs #116 Open account profile when click reblogged user --- .../Contents/Cards/Notification/Reblog.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue index 7262e2b48c..0054633aff 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue @@ -5,7 +5,7 @@
- {{ username(message.account) }} boosted your status + {{ username(message.account) }} boosted your status
@@ -56,6 +56,11 @@ export default { if (link !== null) { shell.openExternal(link) } + }, + openUser (account) { + this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent') + this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account) + this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true) } } } @@ -103,6 +108,10 @@ function findLink (target) { margin-left: 10px; font-size: 14px; float: left; + + .bold { + cursor: pointer; + } } .action-icon { From e965251b28dd20f24a1512ecd15f31c958a9f34c Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 18:09:26 +0900 Subject: [PATCH 5/5] refs #116 Fix design when side bar is appear --- .../TimelineSpace/Contents/Cards/Notification/Favourite.vue | 1 + .../TimelineSpace/Contents/Cards/Notification/Follow.vue | 4 ++++ .../TimelineSpace/Contents/Cards/Notification/Reblog.vue | 1 + 3 files changed, 6 insertions(+) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue index 77f126a54b..159ff234f5 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue @@ -108,6 +108,7 @@ function findLink (target) { margin-left: 10px; font-size: 14px; float: left; + max-width: 80%; .bold { cursor: pointer; diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue index df6ed18f9a..31536d965d 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue @@ -66,6 +66,10 @@ export default { margin-left: 10px; font-size: 14px; float: left; + max-width: 80%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; .bold { cursor: pointer; diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue index 0054633aff..8abbcdac9b 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue @@ -108,6 +108,7 @@ function findLink (target) { margin-left: 10px; font-size: 14px; float: left; + max-width: 80%; .bold { cursor: pointer;