From abc6f70329f150fcce33cfc4304be375e3ebfe3a Mon Sep 17 00:00:00 2001
From: mmble <23295125+mmble@users.noreply.github.com>
Date: Wed, 19 Aug 2020 16:57:43 +0200
Subject: [PATCH] Fixed icons for popup.html embeded in YouTube

---
 manifest/manifest.json | 3 +++
 public/popup.css       | 2 +-
 public/popup.html      | 6 +++---
 src/content.ts         | 7 ++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 2e951380..86c725ee 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -28,6 +28,9 @@
         "icons/PlayerStopIconSponsorBlocker256px.png",
         "icons/PlayerUploadIconSponsorBlocker256px.png",
         "icons/PlayerUploadFailedIconSponsorBlocker256px.png",
+        "icons/settings.svg",
+        "icons/pencil.svg",
+        "icons/check.svg",
         "icons/upvote.png",
         "icons/downvote.png",
         "icons/thumbs_down.svg",
diff --git a/public/popup.css b/public/popup.css
index e387b6ab..b32cff2b 100644
--- a/public/popup.css
+++ b/public/popup.css
@@ -135,7 +135,7 @@ div.logoText>p, .recordingSubtitle {
 }
 
 .recordingSubtitle {
-  margin-bottom: 4px !important;
+  margin-bottom: 5px !important;
 }
 
 .logoText {
diff --git a/public/popup.html b/public/popup.html
index 083f2bf4..00ba923c 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -47,7 +47,7 @@
           </label>
         </div>
         <button id="optionsButton" title="__MSG_optionsInfo__">
-          <img src="/icons/settings.svg" alt="Settings icon" width="16" height="16">
+          <img src="/icons/settings.svg" alt="Settings icon" width="16" height="16" id="sbPopupIconSettings">
           __MSG_Options__
         </button>
       </div>
@@ -60,7 +60,7 @@
         <div id="setUsernameContainer">
           <p id="usernameValue"></p>
           <button id="setUsernameButton" title="__MSG_setUsername__">
-            <img src="/icons/pencil.svg" alt="__MSG_setUsername__" width="16" height="16">
+            <img src="/icons/pencil.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconEdit">
           </button>
         </div>
         <div id="setUsername" style="display: none">
@@ -69,7 +69,7 @@
           </div>
           <input id="usernameInput" hint="Username"></input>
           <button id="submitUsername">
-            <img src="/icons/check.svg" alt="__MSG_setUsername__" width="16" height="16">
+            <img src="/icons/check.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconCheck">
           </button>
         </div>
         </div>
diff --git a/src/content.ts b/src/content.ts
index 8c761ecc..4d6fd3b0 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1264,12 +1264,17 @@ function openInfoMenu() {
                 //old youtube theme
                 parentNode = document.getElementById("watch7-sidebar-contents");
             }
-                
 
             //make the logo source not 404
             //query selector must be used since getElementByID doesn't work on a node and this isn't added to the document yet
             let logo = <HTMLImageElement> popup.querySelector("#sponsorBlockPopupLogo");
+            let settings = <HTMLImageElement> popup.querySelector("#sbPopupIconSettings");
+            let edit = <HTMLImageElement> popup.querySelector("#sbPopupIconEdit");
+            let check = <HTMLImageElement> popup.querySelector("#sbPopupIconCheck");
             logo.src = chrome.extension.getURL("icons/LogoSponsorBlocker256px.png");
+            settings.src = chrome.extension.getURL("icons/settings.svg");
+            edit.src = chrome.extension.getURL("icons/pencil.svg");
+            check.src = chrome.extension.getURL("icons/check.svg");
 
             //remove the style sheet and font that are not necessary
             popup.querySelector("#sponsorBlockPopupFont").remove();