Bug 1626598 - Split close-icon styles to its own file. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D69193

--HG--
rename : toolkit/themes/shared/global.inc.css => toolkit/themes/shared/close-icon.css
extra : moz-landing-system : lando

toolkit/themes/linux/global/global.css

@@ -1,18 +1,11 @@
-/* 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/. */
+% 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/.
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
-/* all localizable skin settings shall live here */
-@import url("chrome://global/locale/intl.css");
-@import url("chrome://global/content/widgets.css");
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
 %include ../../shared/global.inc.css
 
 @media (-moz-menubar-drag) {

toolkit/themes/osx/global/global.css

@@ -1,15 +1,8 @@
-/* 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/. */
-
-/* all localizable skin settings shall live here */
-@import url("chrome://global/locale/intl.css");
-@import url("chrome://global/content/widgets.css");
+% 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/.
 
 %include shared.inc
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
 %include ../../shared/global.inc.css
 
 :root {

toolkit/themes/shared/close-icon.css

@@ -0,0 +1,27 @@
+/* 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/. */
+
+.close-icon {
+  -moz-appearance: none;
+  -moz-context-properties: fill, fill-opacity;
+  list-style-image: url(chrome://global/skin/icons/close.svg);
+  color: inherit !important;
+  fill: currentColor;
+  fill-opacity: 0;
+}
+
+.close-icon:hover {
+  fill-opacity: 0.1;
+}
+
+.close-icon:hover:active {
+  fill-opacity: 0.2;
+}
+
+.close-icon > .button-icon,
+.close-icon > .button-box > .button-icon,
+.close-icon > .toolbarbutton-icon {
+  width: 20px;
+  height: 20px;
+}

toolkit/themes/shared/global.inc.css

@@ -2,6 +2,15 @@
  * 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/. */
 
+/* all localizable skin settings shall live here */
+@import url("chrome://global/locale/intl.css");
+@import url("chrome://global/content/widgets.css");
+
+@import url("close-icon.css");
+
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
 /* General styles */
 
 *|*.plain {
@@ -23,32 +32,6 @@ html|textarea {
   direction: rtl;
 }
 
-/* Close icon */
-
-.close-icon {
-  -moz-appearance: none;
-  -moz-context-properties: fill, fill-opacity;
-  list-style-image: url(chrome://global/skin/icons/close.svg);
-  color: inherit !important;
-  fill: currentColor;
-  fill-opacity: 0;
-}
-
-.close-icon:hover {
-  fill-opacity: 0.1;
-}
-
-.close-icon:hover:active {
-  fill-opacity: 0.2;
-}
-
-.close-icon > .button-icon,
-.close-icon > .button-box > .button-icon,
-.close-icon > .toolbarbutton-icon {
-  width: 20px;
-  height: 20px;
-}
-
 /* Autoscroll popup */
 
 .autoscroller {

toolkit/themes/shared/jar.inc.mn

@@ -22,6 +22,7 @@ toolkit.jar:
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
   skin/classic/global/appPicker.css                        (../../shared/appPicker.css)
 * skin/classic/global/arrowscrollbox.css                   (../../shared/arrowscrollbox.css)
+  skin/classic/global/close-icon.css                       (../../shared/close-icon.css)
   skin/classic/global/config.css                           (../../shared/config.css)
   skin/classic/global/datetimeinputpickers.css             (../../shared/datetimeinputpickers.css)
   skin/classic/global/notification.css                     (../../shared/notification.css)

toolkit/themes/windows/global/global.css

@@ -1,18 +1,11 @@
-/* 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/. */
+% 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/.
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
-/* all localizable skin settings shall live here */
-@import url("chrome://global/locale/intl.css");
-@import url("chrome://global/content/widgets.css");
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
 %include ../../shared/global.inc.css
 
 :root {