From f9977dbb3c9b316521b6be40ddd1a34411f2d835 Mon Sep 17 00:00:00 2001
From: Dym Sohin <re@dym.sh>
Date: Sat, 19 Sep 2020 21:28:03 +0200
Subject: fix excessive underline in sidebar

---
 src/components/nav_panel/nav_panel.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/components/nav_panel/nav_panel.vue')

diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index f8459fd1..080e547f 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -7,12 +7,12 @@
             :to="{ name: timelinesRoute }"
             :class="onTimelineRoute && 'router-link-active'"
           >
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
+            <i class="button-icon icon-home-2" />{{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+            <i class="button-icon icon-bell-alt" />{{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li v-if="currentUser && pleromaChatMessagesAvailable">
@@ -23,12 +23,12 @@
             >
               {{ unreadChatCount }}
             </div>
-            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+            <i class="button-icon icon-chat" />{{ $t("nav.chats") }}
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
-            <i class="button-icon icon-user-plus" /> {{ $t("nav.friend_requests") }}
+            <i class="button-icon icon-user-plus" />{{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
               class="badge follow-request-count"
@@ -39,7 +39,7 @@
         </li>
         <li>
           <router-link :to="{ name: 'about' }">
-            <i class="button-icon icon-info-circled" /> {{ $t("nav.about") }}
+            <i class="button-icon icon-info-circled" />{{ $t("nav.about") }}
           </router-link>
         </li>
       </ul>
-- 
cgit v1.2.3-70-g09d2


From 1675f1a133934956a39ca4ade99b809789bb84a2 Mon Sep 17 00:00:00 2001
From: Dym Sohin <re@dym.sh>
Date: Tue, 29 Sep 2020 13:13:42 +0200
Subject: scoped back margin-right on icons

---
 src/App.scss                                   | 1 -
 src/components/nav_panel/nav_panel.vue         | 4 ++++
 src/components/timeline_menu/timeline_menu.vue | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/components/nav_panel/nav_panel.vue')

diff --git a/src/App.scss b/src/App.scss
index 8b1bbd2d..e2e2d079 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -809,7 +809,6 @@ nav {
 
 .button-icon {
   font-size: 1.2em;
-  margin-right: 0.5em;
 }
 
 @keyframes shakeError {
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 080e547f..4f944c95 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -125,6 +125,10 @@
   }
 }
 
+.nav-panel .button-icon {
+  margin-right: 0.5em;
+}
+
 .nav-panel .button-icon:before {
   width: 1.1em;
 }
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 3c029093..481b1d09 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -170,6 +170,10 @@
         text-decoration: underline;
       }
     }
+
+    i {
+      margin: 0 0.5em;
+    }
   }
 }
 
-- 
cgit v1.2.3-70-g09d2

