From 8ce5cbe94373109d75bdcbe58bc571460f8a3b5e Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sat, 18 Sep 2021 17:32:02 +0100
Subject: [PATCH] Tweak styles to accommodate for buttons

---
 src/notification/bar.html   |  2 +-
 src/notification/bar.scss   | 14 ++++++++------
 src/popup/scss/box.scss     | 10 ++++++++--
 src/popup/scss/buttons.scss |  7 +++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/notification/bar.html b/src/notification/bar.html
index fcc34c585d..f50db6e5fd 100644
--- a/src/notification/bar.html
+++ b/src/notification/bar.html
@@ -15,7 +15,7 @@
                 </td>
                 <td id="content"></td>
                 <td align="right" width="15">
-                    <button type="button" id="close-button">
+                    <button type="button" class="neutral" id="close-button">
                         <img id="close" alt="X" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeBAMAAADJHrORAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAABJQTFRFAAAAMzMzMzMzMzMzMzMzMzMzbxxq5QAAAAZ0Uk5TAECg/2CfwOuXQgAAAJVJREFUeJxVkdEJwzAMRNXgAQpZINAu0Fz7b3AHyP7T1MrppNQfMuI9sE42s7vp3Lws7+zHMcsDPdqGz8SAhAEctgIhNDhiDYyNVw+8p5ZYgrCExBS+iSmgMIXCEhJTKMy+Yobf//BF0Hv9gp8lcPKRAifPPSiYBAULoXJTWHNyJy/f917vbv4fCtZOslSwcZLKMf/zB2MLKtNp5GuwAAAAAElFTkSuQmCC" />
                     </button>
                 </td>
diff --git a/src/notification/bar.scss b/src/notification/bar.scss
index 1f673d5255..bc49e8a2c6 100644
--- a/src/notification/bar.scss
+++ b/src/notification/bar.scss
@@ -55,31 +55,33 @@ img {
     margin-right: 10px;
 }
 
-button:not(.link) {
+button:not(.link),
+button:not(.neutral) {
     background-color: #175DDC;
     padding: 5px 15px;
     border-radius: 3px;
     color: #ffffff;
     border: 0;
-}
 
-    button:not(.link):hover {
+    &:hover {
         cursor: pointer;
         background-color: #1751bd;
     }
+}
 
-button.link {
+button.link,
+button.neutral {
     background: none;
     padding: 5px 15px;
     color: #175DDC;
     border: 0;
-}
 
-    button.link:hover {
+    &:hover {
         cursor: pointer;
         background: none;
         text-decoration: underline;
     }
+}
 
 body[class*='lang-en'] .add-buttons {
     width: 175px;
diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss
index c11651c49b..51930d76f0 100644
--- a/src/popup/scss/box.scss
+++ b/src/popup/scss/box.scss
@@ -300,7 +300,8 @@
             margin-top: 5px;
         }
 
-        > a {
+        > a,
+        > button {
             padding: 8px 8px 8px 4px;
             margin: 0;
 
@@ -315,6 +316,12 @@
         padding-left: 10px;
     }
 
+    &.box-content-row-newmulti {
+        @include themify($themes) {
+            color: themed('primaryColor');
+        }
+    }
+
     &.box-content-row-checkbox, &.box-content-row-input, &.box-content-row-slider {
         label, .row-label {
             font-size: $font-size-base;
@@ -511,7 +518,6 @@
         justify-content: center;
         align-items: center;
         min-width: 34px;
-        height: 100%;
         margin-left: -5px;
 
         @include themify($themes) {
diff --git a/src/popup/scss/buttons.scss b/src/popup/scss/buttons.scss
index f312aa4629..f6f3718b8f 100644
--- a/src/popup/scss/buttons.scss
+++ b/src/popup/scss/buttons.scss
@@ -69,7 +69,8 @@
         width: 100%;
     }
 
-    &.link {
+    &.link,
+    &.neutral {
         border: none !important;
         background: none !important;
 
@@ -90,9 +91,11 @@
 button.box-content-row {
     display: block;
     width: 100%;
-    background: none;
+    text-align: left;
 }
 
 button {
     border: none;
+    background: transparent;
+    color: inherit;
 }
\ No newline at end of file