From 41ed98b736a282e0e02840bf9308763fda47c225 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Thu, 13 Aug 2020 17:30:13 +0800
Subject: [PATCH] [Pale-Moon] Issue #1826 - Restore missing close icon on the
 undo prompt at the quick dial page

While this could've all been placed in the shared new tab style sheet, OSX does not include the SVG close icon used by the other platforms and has its own custom close icon.
---
 .../palemoon/themes/linux/newtab/newTab.css       | 14 +++++++++-----
 application/palemoon/themes/osx/newtab/newTab.css | 15 +++++++++++----
 .../palemoon/themes/shared/newtab/newTab.css.inc  | 15 ++++++++-------
 .../palemoon/themes/windows/newtab/newTab.css     | 15 +++++++++++----
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/application/palemoon/themes/linux/newtab/newTab.css b/application/palemoon/themes/linux/newtab/newTab.css
index 357b3139be..7250bd18e4 100644
--- a/application/palemoon/themes/linux/newtab/newTab.css
+++ b/application/palemoon/themes/linux/newtab/newTab.css
@@ -17,11 +17,15 @@
 }
 
 #newtab-undo-close-button {
-  padding: 0;
-  border: none;
-  -moz-user-focus: normal;
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 16, 16, 0);
+  background-position: center center;
+  background-repeat: no-repeat;
 }
 
-#newtab-undo-close-button > .toolbarbutton-icon {
-  margin: -4px;
+#newtab-undo-close-button:hover {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 32, 16, 16);
+}
+
+#newtab-undo-close-button:hover:active {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32);
 }
diff --git a/application/palemoon/themes/osx/newtab/newTab.css b/application/palemoon/themes/osx/newtab/newTab.css
index b8b0fd6998..9a5327594e 100644
--- a/application/palemoon/themes/osx/newtab/newTab.css
+++ b/application/palemoon/themes/osx/newtab/newTab.css
@@ -22,8 +22,15 @@
 }
 
 #newtab-undo-close-button {
-  -moz-appearance: none;
-  padding: 0;
-  border: none;
-  -moz-user-focus: normal;
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 16, 16, 0);
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+#newtab-undo-close-button:hover {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 32, 16, 16);
+}
+
+#newtab-undo-close-button:hover:active {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 48, 16, 32);
 }
diff --git a/application/palemoon/themes/shared/newtab/newTab.css.inc b/application/palemoon/themes/shared/newtab/newTab.css.inc
index 3341ba7e54..32d7aca357 100644
--- a/application/palemoon/themes/shared/newtab/newTab.css.inc
+++ b/application/palemoon/themes/shared/newtab/newTab.css.inc
@@ -43,13 +43,14 @@ body {
   outline: 1px dotted;
 }
 
-
-#newtab-undo-close-button > .toolbarbutton-text {
-  display: none;
-}
-
-#newtab-undo-close-button:-moz-focusring {
-  outline: 1px dotted;
+#newtab-undo-close-button {
+  -moz-appearance: none;
+  padding: 0;
+  border: none;
+  width: 16px;
+  height: 16px;
+  float: right;
+  right: 0;
 }
 
 /* TOGGLE */
diff --git a/application/palemoon/themes/windows/newtab/newTab.css b/application/palemoon/themes/windows/newtab/newTab.css
index b8b0fd6998..ea68bb8067 100644
--- a/application/palemoon/themes/windows/newtab/newTab.css
+++ b/application/palemoon/themes/windows/newtab/newTab.css
@@ -22,8 +22,15 @@
 }
 
 #newtab-undo-close-button {
-  -moz-appearance: none;
-  padding: 0;
-  border: none;
-  -moz-user-focus: normal;
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 16, 16, 0);
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+#newtab-undo-close-button:hover {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 32, 16, 16);
+}
+
+#newtab-undo-close-button:hover:active {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32);
 }