Bug 1625911 - Split popupnotification.css from notification.css. r=dao
authorTim Nguyen <ntim.bugs@gmail.com>
Mon, 30 Mar 2020 13:57:23 +0000
changeset 521081 66f0b6ccb1d119bbfc61fd60d75b90d89eec2c75
parent 521080 98e0adb65668803d2711ab00e88359f1573a3474
child 521082 71275a17177cf84cf2ed80e219e46b8f95a6c02f
push id111461
push userntim.bugs@gmail.com
push dateMon, 30 Mar 2020 14:44:28 +0000
treeherderautoland@66f0b6ccb1d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1625911
milestone76.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1625911 - Split popupnotification.css from notification.css. r=dao Differential Revision: https://phabricator.services.mozilla.com/D68788
toolkit/content/widgets.css
toolkit/themes/linux/global/jar.mn
toolkit/themes/linux/global/notification.css
toolkit/themes/linux/global/popupnotification.css
toolkit/themes/osx/global/jar.mn
toolkit/themes/osx/global/notification.css
toolkit/themes/osx/global/popupnotification.css
toolkit/themes/shared/jar.inc.mn
toolkit/themes/shared/notification.css
toolkit/themes/shared/notification.inc.css
toolkit/themes/shared/popupnotification.inc.css
toolkit/themes/windows/global/jar.mn
toolkit/themes/windows/global/notification.css
toolkit/themes/windows/global/popupnotification.css
--- a/toolkit/content/widgets.css
+++ b/toolkit/content/widgets.css
@@ -11,16 +11,17 @@
 @import url("chrome://global/skin/button.css");
 @import url("chrome://global/skin/checkbox.css");
 @import url("chrome://global/skin/findBar.css");
 @import url("chrome://global/skin/menu.css");
 @import url("chrome://global/skin/menulist.css");
 @import url("chrome://global/skin/notification.css");
 @import url("chrome://global/skin/numberinput.css");
 @import url("chrome://global/skin/popup.css");
+@import url("chrome://global/skin/popupnotification.css");
 @import url("chrome://global/skin/radio.css");
 @import url("chrome://global/skin/richlistbox.css");
 @import url("chrome://global/skin/splitter.css");
 @import url("chrome://global/skin/tabbox.css");
 @import url("chrome://global/skin/textbox.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://global/skin/toolbarbutton.css");
 @import url("chrome://global/skin/tree.css");
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -10,18 +10,18 @@ toolkit.jar:
    skin/classic/global/checkbox.css
    skin/classic/global/commonDialog.css
    skin/classic/global/dropmarker.css
 *  skin/classic/global/findBar.css
 *  skin/classic/global/global.css
    skin/classic/global/menu.css
    skin/classic/global/menulist.css
    skin/classic/global/netError.css
-*  skin/classic/global/notification.css
    skin/classic/global/popup.css
+*  skin/classic/global/popupnotification.css
    skin/classic/global/radio.css
    skin/classic/global/richlistbox.css
    skin/classic/global/splitter.css
    skin/classic/global/tabbox.css
    skin/classic/global/textbox.css
    skin/classic/global/toolbar.css
    skin/classic/global/toolbarbutton.css
    skin/classic/global/tooltip.css
rename from toolkit/themes/linux/global/notification.css
rename to toolkit/themes/linux/global/popupnotification.css
--- a/toolkit/themes/linux/global/notification.css
+++ b/toolkit/themes/linux/global/popupnotification.css
@@ -1,12 +1,10 @@
+%if 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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/notification.inc.css
+%endif
 %include ../../shared/popupnotification.inc.css
 
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
   border-inline-start: 1px solid var(--panel-separator-color);
 }
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -10,19 +10,19 @@ toolkit.jar:
   skin/classic/global/checkbox.css
   skin/classic/global/commonDialog.css
   skin/classic/global/dialog.css
   skin/classic/global/dropmarker.css
 * skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/menu.css
   skin/classic/global/menulist.css
-* skin/classic/global/notification.css
   skin/classic/global/netError.css
   skin/classic/global/popup.css
+* skin/classic/global/popupnotification.css
   skin/classic/global/radio.css
   skin/classic/global/richlistbox.css
   skin/classic/global/scrollbars.css                                 (nativescrollbars.css)
   skin/classic/global/splitter.css
   skin/classic/global/tabprompts.css
   skin/classic/global/tabbox.css
   skin/classic/global/textbox.css
   skin/classic/global/toolbar.css
rename from toolkit/themes/osx/global/notification.css
rename to toolkit/themes/osx/global/popupnotification.css
--- a/toolkit/themes/osx/global/notification.css
+++ b/toolkit/themes/osx/global/popupnotification.css
@@ -1,13 +1,10 @@
+%if 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/. */
-
-%include shared.inc
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/notification.inc.css
+%endif
 %include ../../shared/popupnotification.inc.css
 
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
   border-inline-start: 1px solid var(--panel-separator-color);
 }
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -19,16 +19,17 @@ toolkit.jar:
 * skin/classic/global/aboutReader.css                      (../../shared/aboutReader.css)
   skin/classic/global/aboutRights.css                      (../../shared/aboutRights.css)
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   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/config.css                           (../../shared/config.css)
   skin/classic/global/datetimeinputpickers.css             (../../shared/datetimeinputpickers.css)
+  skin/classic/global/notification.css                     (../../shared/notification.css)
   skin/classic/global/numberinput.css                      (../../shared/numberinput.css)
   skin/classic/global/passwordmgr.css                      (../../shared/passwordmgr.css)
   skin/classic/global/icons/arrow-left.svg                 (../../shared/icons/arrow-left.svg)
   skin/classic/global/icons/autoscroll.svg                 (../../shared/icons/autoscroll.svg)
   skin/classic/global/icons/autoscroll-horizontal.svg      (../../shared/icons/autoscroll-horizontal.svg)
   skin/classic/global/icons/autoscroll-vertical.svg        (../../shared/icons/autoscroll-vertical.svg)
   skin/classic/global/icons/check.svg                      (../../shared/icons/check.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
rename from toolkit/themes/shared/notification.inc.css
rename to toolkit/themes/shared/notification.css
--- a/toolkit/themes/shared/popupnotification.inc.css
+++ b/toolkit/themes/shared/popupnotification.inc.css
@@ -1,12 +1,14 @@
 /* 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/. */
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
 .popup-notification-header-container,
 .popup-notification-footer-container {
   display: flex;
   max-width: calc(2 * var(--arrowpanel-padding) + 32px + 4px + 25em);
 }
 
 .popup-notification-body-container {
   padding: var(--arrowpanel-padding);
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -6,25 +6,25 @@
 
 toolkit.jar:
   skin/classic/global/autocomplete.css
   skin/classic/global/button.css
   skin/classic/global/checkbox.css
   skin/classic/global/dropmarker.css
 * skin/classic/global/menu.css
   skin/classic/global/menulist.css
-* skin/classic/global/popup.css
   skin/classic/global/radio.css
   skin/classic/global/tabbox.css
   skin/classic/global/textbox.css
   skin/classic/global/commonDialog.css
 * skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/netError.css
-* skin/classic/global/notification.css
+* skin/classic/global/popup.css
+* skin/classic/global/popupnotification.css
   skin/classic/global/printPageSetup.css
   skin/classic/global/richlistbox.css
   skin/classic/global/splitter.css
   skin/classic/global/toolbar.css
   skin/classic/global/toolbarbutton.css
   skin/classic/global/tooltip.css
 * skin/classic/global/tree.css
 * skin/classic/global/alerts/alert.css                     (alerts/alert.css)
rename from toolkit/themes/windows/global/notification.css
rename to toolkit/themes/windows/global/popupnotification.css
--- a/toolkit/themes/windows/global/notification.css
+++ b/toolkit/themes/windows/global/popupnotification.css
@@ -1,15 +1,13 @@
+%if 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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/notification.inc.css
+%endif
 %include ../../shared/popupnotification.inc.css
 
 /* Override default icon size which is too small for this dropdown */
 .popup-notification-dropmarker > .button-box > .button-menu-dropmarker {
   width: 16px;
   height: 16px;
 }