From 1a27c785b83d85cd843c7f611b502d2de1c5009d Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Mon, 20 Feb 2023 22:17:34 +0200
Subject: [PATCH] Backed out changeset a56f7bf6fb9b (bug 1710910) for causing
 linux build bustage. CLOSED TREE

---
 browser/themes/shared/tabs.css           | 4 +---
 toolkit/content/widgets/message-bar.css  | 6 +++---
 toolkit/themes/shared/desktop-jar.inc.mn | 1 -
 toolkit/themes/shared/icons/close-12.svg | 6 ------
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 toolkit/themes/shared/icons/close-12.svg

diff --git a/browser/themes/shared/tabs.css b/browser/themes/shared/tabs.css
index 206eae223c87..12f1f587230b 100644
--- a/browser/themes/shared/tabs.css
+++ b/browser/themes/shared/tabs.css
@@ -448,10 +448,8 @@
   margin-inline-end: calc(var(--inline-tab-padding) / -2);
   width: 24px;
   height: 24px;
-  padding: 6px;
+  padding: 7px;
   border-radius: var(--tab-border-radius);
-  list-style-image: url(chrome://global/skin/icons/close-12.svg);
-  fill: var(--toolbarbutton-icon-fill);
 }
 
 /* The following rulesets allow showing more of the tab title */
diff --git a/toolkit/content/widgets/message-bar.css b/toolkit/content/widgets/message-bar.css
index 56cb012730ce..0de6d5a9e605 100644
--- a/toolkit/content/widgets/message-bar.css
+++ b/toolkit/content/widgets/message-bar.css
@@ -7,9 +7,9 @@
   --warn-icon-url: url("chrome://global/skin/icons/warning.svg");
   --success-icon-url: url("chrome://global/skin/icons/check.svg");
   --error-icon-url: url("chrome://global/skin/icons/error.svg");
-  --close-icon-url: url("chrome://global/skin/icons/close-12.svg");
+  --close-icon-url: url("chrome://global/skin/icons/close.svg");
   --icon-size: 16px;
-  --close-icon-size: 24px;
+  --close-icon-size: 32px;
 }
 
 :host([message-bar-type=infobar]) {
@@ -226,7 +226,7 @@
 
 .close {
   margin: 4px 8px;
-  background-size: 12px;
+  background-size: 16px;
 }
 
 .notification-button {
diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn
index edc5d5453e9f..890c1ce14931 100644
--- a/toolkit/themes/shared/desktop-jar.inc.mn
+++ b/toolkit/themes/shared/desktop-jar.inc.mn
@@ -62,7 +62,6 @@
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
   skin/classic/global/icons/chevron.svg                    (../../shared/icons/chevron.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
-  skin/classic/global/icons/close-12.svg                   (../../shared/icons/close-12.svg)
   skin/classic/global/icons/close-fill.svg                 (../../shared/icons/close-fill.svg)
   skin/classic/global/icons/columnpicker.svg               (../../shared/icons/columnpicker.svg)
   skin/classic/global/icons/defaultFavicon.svg             (../../shared/icons/defaultFavicon.svg)
diff --git a/toolkit/themes/shared/icons/close-12.svg b/toolkit/themes/shared/icons/close-12.svg
deleted file mode 100644
index 9df6bee3b610..000000000000
--- a/toolkit/themes/shared/icons/close-12.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" width="12" height="12" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M5.859 6.849 2.854 9.854a.5.5 0 0 1-.707-.707l3.005-3.005 0-.283-3.005-3.006a.5.5 0 0 1 .707-.707l3.005 3.005.283 0 3.005-3.005a.5.5 0 0 1 .707.707L6.849 5.859l0 .283 3.005 3.005a.5.5 0 0 1-.707.707L6.142 6.849l.001.001-.284-.001z"/>
-</svg>