diff --git a/toolkit/content/components.css b/toolkit/content/components.css index 2373f6953ba2..c002089d133d 100644 --- a/toolkit/content/components.css +++ b/toolkit/content/components.css @@ -2,9 +2,14 @@ * 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/. */ -/* ===== components.css ================================================= - == Styles ported from XBL , loaded as UA styles in every XUL doc - ======================================================================= */ +/* ===== components.css ================================================== + == + == THESE STYLES WILL BE MOVED TO "widgets.css". + == + == These are loaded as UA syles, but eventually they will become + == document styles in "widgets.css". See bug 1463820 for details. + == + ======================================================================= */ @import url("chrome://global/skin/dropmarker.css"); @import url("chrome://global/skin/groupbox.css"); diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 4c3ddb422fbc..50590a520dba 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -62,6 +62,7 @@ toolkit.jar: #ifndef MOZ_FENNEC content/global/viewZoomOverlay.js #endif + content/global/widgets.css content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/button.xml (widgets/button.xml) diff --git a/toolkit/content/widgets.css b/toolkit/content/widgets.css new file mode 100644 index 000000000000..3e7080e51e07 --- /dev/null +++ b/toolkit/content/widgets.css @@ -0,0 +1,7 @@ +/* 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/. */ + +/* ===== widgets.css ===================================================== + == Styles ported from XBL , loaded by "global.css". + ======================================================================= */ diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css index b98083d20b0e..6e42dfa192ab 100644 --- a/toolkit/themes/linux/global/global.css +++ b/toolkit/themes/linux/global/global.css @@ -8,6 +8,7 @@ /* all localizable skin settings shall live here */ @import url("chrome://global/locale/intl.css"); +@import url("chrome://global/content/widgets.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/toolkit/themes/osx/global/global.css b/toolkit/themes/osx/global/global.css index 4abf77ac2f83..d7f8a87ed33d 100644 --- a/toolkit/themes/osx/global/global.css +++ b/toolkit/themes/osx/global/global.css @@ -4,6 +4,7 @@ /* all localizable skin settings shall live here */ @import url("chrome://global/locale/intl.css"); +@import url("chrome://global/content/widgets.css"); %include shared.inc @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css index 34f2e2a4deac..383ec69415d7 100644 --- a/toolkit/themes/windows/global/global.css +++ b/toolkit/themes/windows/global/global.css @@ -8,6 +8,7 @@ /* all localizable skin settings shall live here */ @import url("chrome://global/locale/intl.css"); +@import url("chrome://global/content/widgets.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");