From 5653608e2854a8e0ed643075e74f94cd270b0b93 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Fri, 29 Apr 2022 20:47:45 +0100
Subject: [PATCH] Simplify base, list, and vault styles

Since links are now buttons, no need to double up selectors for both types of elements. No need to double-up theming in base, as this also causes incorrect "x" in toasts.
---
 src/scss/base.scss  |  3 +--
 src/scss/list.scss  |  3 ---
 src/scss/vault.scss | 15 ---------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/scss/base.scss b/src/scss/base.scss
index 929a7af4..70889595 100644
--- a/src/scss/base.scss
+++ b/src/scss/base.scss
@@ -50,8 +50,7 @@ img {
   border: none;
 }
 
-a,
-button {
+a {
   text-decoration: none;
 
   @include themify($themes) {
diff --git a/src/scss/list.scss b/src/scss/list.scss
index 68b93be4..5ea5d6be 100644
--- a/src/scss/list.scss
+++ b/src/scss/list.scss
@@ -1,8 +1,6 @@
 @import "variables.scss";
 
-.list > a,
 .list > button {
-  display: block;
   padding: 3px 10px;
   text-decoration: none;
   position: relative;
@@ -106,7 +104,6 @@
   }
 }
 
-.list > a.flex-list-item,
 .list > button.flex-list-item {
   display: flex;
   align-items: center;
diff --git a/src/scss/vault.scss b/src/scss/vault.scss
index f9f5c549..adef1984 100644
--- a/src/scss/vault.scss
+++ b/src/scss/vault.scss
@@ -129,7 +129,6 @@ app-root {
     ul.bwi-ul {
       // Level 1
       li {
-        > a,
         > button {
           padding-left: 12px;
         }
@@ -138,7 +137,6 @@ app-root {
           left: -4px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 11px;
         }
@@ -146,7 +144,6 @@ app-root {
 
       // Level 2
       ul li {
-        > a,
         > button {
           padding-left: 23px;
         }
@@ -155,7 +152,6 @@ app-root {
           left: 7px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 22px;
         }
@@ -163,7 +159,6 @@ app-root {
 
       // Level 3
       ul ul li {
-        > a,
         > button {
           padding-left: 34px;
         }
@@ -172,7 +167,6 @@ app-root {
           left: 18px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 33px;
         }
@@ -180,7 +174,6 @@ app-root {
 
       // Level 4
       ul ul ul li {
-        > a,
         > button {
           padding-left: 45px;
         }
@@ -189,7 +182,6 @@ app-root {
           left: 29px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 44px;
         }
@@ -197,7 +189,6 @@ app-root {
 
       // Level 5
       ul ul ul ul li {
-        > a,
         > button {
           padding-left: 56px;
         }
@@ -206,7 +197,6 @@ app-root {
           left: 40px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 55px;
         }
@@ -214,7 +204,6 @@ app-root {
 
       // Level 6
       ul ul ul ul ul li {
-        > a,
         > button {
           padding-left: 67px;
         }
@@ -223,7 +212,6 @@ app-root {
           left: 51px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 66px;
         }
@@ -231,7 +219,6 @@ app-root {
 
       // Level 7
       ul ul ul ul ul ul li {
-        > a,
         > button {
           padding-left: 78px;
         }
@@ -240,7 +227,6 @@ app-root {
           left: 62px;
         }
 
-        &.active > a .bwi-li,
         &.active > button .bwi-li {
           left: 77px;
         }
@@ -252,7 +238,6 @@ app-root {
       margin: 0;
 
       li {
-        a,
         button {
           padding: 5px 0;
           display: flex;