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/timeline_menu/timeline_menu.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index be512d60..3c029093 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -64,7 +64,7 @@
   .timeline-menu-popover-wrap {
     overflow: hidden;
     // Match panel heading padding to line up menu with bottom of heading
-    margin-top: 0.6rem;
+    margin-top: 0.6rem 0.65em;
     padding: 0 15px 15px 15px;
   }
   .timeline-menu-popover {
@@ -138,10 +138,6 @@
     &:last-child {
       border: none;
     }
-
-    i {
-      margin: 0 0.5em;
-    }
   }
 
   a {
-- 
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/timeline_menu/timeline_menu.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


From c17012cfe19ecab7efc27a54c90c4369c36de343 Mon Sep 17 00:00:00 2001
From: Dym Sohin <re@dym.sh>
Date: Tue, 29 Sep 2020 13:20:16 +0200
Subject: fix appended 0.65em on wrong line

---
 src/components/timeline_menu/timeline_menu.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 481b1d09..b7e5f2da 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -64,7 +64,7 @@
   .timeline-menu-popover-wrap {
     overflow: hidden;
     // Match panel heading padding to line up menu with bottom of heading
-    margin-top: 0.6rem 0.65em;
+    margin-top: 0.6rem;
     padding: 0 15px 15px 15px;
   }
   .timeline-menu-popover {
@@ -142,7 +142,7 @@
 
   a {
     display: block;
-    padding: 0.6em 0;
+    padding: 0.6em 0.65em;
 
     &:hover {
       background-color: $fallback--lightBg;
@@ -172,7 +172,7 @@
     }
 
     i {
-      margin: 0 0.5em;
+      margin-right: 0.5em;
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2

