From 60e2db3f0d0afaec6eed8708001359125326a1a1 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 5 Apr 2022 21:06:19 +0900
Subject: [PATCH 1/3] Fix align side menu icons
---
.../components/TimelineSpace/SideMenu.vue | 196 ++++++++++++++----
1 file changed, 151 insertions(+), 45 deletions(-)
diff --git a/src/renderer/components/TimelineSpace/SideMenu.vue b/src/renderer/components/TimelineSpace/SideMenu.vue
index dcc74f8829..56253b7c99 100644
--- a/src/renderer/components/TimelineSpace/SideMenu.vue
+++ b/src/renderer/components/TimelineSpace/SideMenu.vue
@@ -41,66 +41,148 @@
:class="collapse ? 'el-menu-vertical timeline-menu narrow-menu' : 'el-menu-vertical timeline-menu'"
role="menu"
>
-
-
- {{ $t('side_menu.home') }}
-
+
-
-
- {{ $t('side_menu.mention') }}
-
+
-
-
- {{ $t('side_menu.direct') }}
-
+
-
-
- {{ $t('side_menu.favourite') }}
+
-
-
- {{ $t('side_menu.bookmark') }}
+
-
-
- {{ $t('side_menu.local') }}
-
+
-
-
- {{ $t('side_menu.public') }}
-
+
-
-
- {{ $t('side_menu.search') }}
+
-
-
- {{ $t('side_menu.hashtag') }}
+
-
-
- {{ $t('side_menu.lists') }}
+
@@ -332,6 +428,16 @@ export default {
line-height: 32px;
font-size: 14px;
}
+
+ .menu-item {
+ display: flex;
+
+ .menu-item-icon {
+ text-align: center;
+ padding-right: 2px;
+ width: 18px;
+ }
+ }
}
.timeline-menu:hover /deep/ {
From 686894349b69bf889f2409c02b78213d657ccd5d Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 5 Apr 2022 21:16:14 +0900
Subject: [PATCH 2/3] Fix align header menu icons
---
src/renderer/components/TimelineSpace/HeaderMenu.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/renderer/components/TimelineSpace/HeaderMenu.vue b/src/renderer/components/TimelineSpace/HeaderMenu.vue
index a1e47e5354..6104027f6f 100644
--- a/src/renderer/components/TimelineSpace/HeaderMenu.vue
+++ b/src/renderer/components/TimelineSpace/HeaderMenu.vue
@@ -215,7 +215,6 @@ export default {
}
.tools {
- font-size: 18px;
display: flex;
justify-content: flex-end;
align-items: center;
From 5385f3baf59252649e594766c2fc409e78025fe5 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 5 Apr 2022 22:56:52 +0900
Subject: [PATCH 3/3] Fix align toot action icons
---
src/renderer/components/organisms/Toot.vue | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/renderer/components/organisms/Toot.vue b/src/renderer/components/organisms/Toot.vue
index b06f07c9a7..4f5f72b457 100644
--- a/src/renderer/components/organisms/Toot.vue
+++ b/src/renderer/components/organisms/Toot.vue
@@ -151,9 +151,9 @@
>
-
+
{{ reblogsCount }}
-
+
-
+
{{ favouritesCount }}
-
+
0) {
return this.originalMessage.reblogs_count
}
- return ''
+ return null
},
favouritesCount: function () {
if (this.originalMessage.favourites_count > 0) {
return this.originalMessage.favourites_count
}
- return ''
+ return null
},
isMyMessage: function () {
return this.$store.state.TimelineSpace.account.accountId === this.originalMessage.account.id
@@ -951,15 +951,16 @@ export default {
}
.tool-box {
- float: left;
+ display: flex;
.fa-icon {
vertical-align: bottom;
}
button {
- margin: 0 8px;
- padding: 0;
+ display: block;
+ padding: 0 8px;
+ margin: 0;
color: #909399;
}
@@ -974,15 +975,14 @@ export default {
.count {
font-size: 0.8em;
color: #909399;
- margin: 0 0 4px -8px;
- }
+ margin: 0 0 0 -4px;
- .bookmark {
- margin: 0 0 0 8px;
+ &:blank {
+ display: none;
+ }
}
.bookmarked {
- margin: 0 0 0 8px;
color: #ff5050;
}