From fa0974c68eb2cf634fe1a9f40f05903dddbd5502 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Mon, 9 Nov 2015 15:22:24 +0000 Subject: [PATCH] Bug 1210703 - fix toolkit theme overlap, r=dao --HG-- extra : commitid : 5R9wy1enkoL extra : rebase_source : 1feee16e611c1ce68f86e7806c5dc21cf89dbecd --- toolkit/themes/linux/global/jar.mn | 100 +++++++------ toolkit/themes/linux/help/jar.mn | 2 +- toolkit/themes/linux/mozapps/jar.mn | 50 +++---- toolkit/themes/moz.build | 15 +- toolkit/themes/osx/global/jar.mn | 4 +- toolkit/themes/osx/help/jar.mn | 1 - toolkit/themes/osx/mozapps/jar.mn | 1 - toolkit/themes/shared/jar.inc.mn | 5 + toolkit/themes/shared/non-mac.jar.inc.mn | 183 +++++++++++++++++++++++ toolkit/themes/windows/global/jar.mn | 143 +----------------- toolkit/themes/windows/help/jar.mn | 6 - toolkit/themes/windows/mozapps/jar.mn | 33 ---- 12 files changed, 281 insertions(+), 262 deletions(-) create mode 100644 toolkit/themes/shared/non-mac.jar.inc.mn diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn index dd9beb136f20..5a5b33016c20 100644 --- a/toolkit/themes/linux/global/jar.mn +++ b/toolkit/themes/linux/global/jar.mn @@ -2,54 +2,58 @@ # 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/non-mac.jar.inc.mn + toolkit.jar: -+ skin/classic/global/autocomplete.css -+ skin/classic/global/button.css -+ skin/classic/global/checkbox.css -+ skin/classic/global/colorpicker.css -+ skin/classic/global/commonDialog.css -+ skin/classic/global/dropmarker.css -+ skin/classic/global/filepicker.css -+ skin/classic/global/Filepicker.png (filepicker/Filepicker.png) -+ skin/classic/global/findBar.css -+ skin/classic/global/global.css -+ skin/classic/global/groupbox.css -+ skin/classic/global/listbox.css -+ skin/classic/global/menu.css -+ skin/classic/global/menulist.css -+ skin/classic/global/netError.css -+ skin/classic/global/notification.css -+ skin/classic/global/numberbox.css -+ skin/classic/global/popup.css -+ skin/classic/global/preferences.css -+ skin/classic/global/printPageSetup.css -+ skin/classic/global/printPreview.css -+ skin/classic/global/radio.css -+ skin/classic/global/scrollbox.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/tree.css -+ skin/classic/global/alerts/alert.css (alerts/alert.css) -+ skin/classic/global/console/console.css (console/console.css) -+ skin/classic/global/console/console.png (console/console.png) -+ skin/classic/global/console/console-toolbar.png (console/console-toolbar.png) -+ skin/classic/global/dirListing/remote.png (dirListing/remote.png) -+ skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg) -+ skin/classic/global/icons/Authentication.png (icons/Authentication.png) -+ skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) -+ skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) -+ skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) -+ skin/classic/global/icons/close.svg (icons/close.svg) -+ skin/classic/global/icons/loading_16.png (icons/loading_16.png) -+ skin/classic/global/icons/panelarrow-horizontal.svg (icons/panelarrow-horizontal.svg) -+ skin/classic/global/icons/panelarrow-vertical.svg (icons/panelarrow-vertical.svg) -+ skin/classic/global/icons/resizer.png (icons/resizer.png) -+ skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) -+ skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) -+ skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) + skin/classic/global/autocomplete.css + skin/classic/global/button.css + skin/classic/global/checkbox.css + skin/classic/global/colorpicker.css + skin/classic/global/commonDialog.css + skin/classic/global/dropmarker.css + skin/classic/global/filepicker.css + skin/classic/global/Filepicker.png (filepicker/Filepicker.png) + skin/classic/global/findBar.css + skin/classic/global/global.css + skin/classic/global/groupbox.css + skin/classic/global/listbox.css + skin/classic/global/menu.css + skin/classic/global/menulist.css + skin/classic/global/netError.css + skin/classic/global/notification.css + skin/classic/global/numberbox.css + skin/classic/global/popup.css + skin/classic/global/preferences.css + skin/classic/global/printPageSetup.css + skin/classic/global/printPreview.css + skin/classic/global/radio.css + skin/classic/global/scrollbox.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/tree.css + skin/classic/global/alerts/alert.css (alerts/alert.css) + skin/classic/global/console/console.css (console/console.css) + skin/classic/global/console/console.png (console/console.png) + skin/classic/global/console/console-toolbar.png (console/console-toolbar.png) + skin/classic/global/dirListing/remote.png (dirListing/remote.png) + + skin/classic/global/icons/Authentication.png (icons/Authentication.png) + skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) + skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) + skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) + skin/classic/global/icons/close.svg (icons/close.svg) + skin/classic/global/icons/loading_16.png (icons/loading_16.png) + skin/classic/global/icons/panelarrow-horizontal.svg (icons/panelarrow-horizontal.svg) + skin/classic/global/icons/panelarrow-vertical.svg (icons/panelarrow-vertical.svg) + skin/classic/global/icons/resizer.png (icons/resizer.png) + skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) + skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) + skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) + * skin/classic/global/in-content/common.css (in-content/common.css) * skin/classic/global/in-content/info-pages.css (in-content/info-pages.css) -+ skin/classic/global/toolbar/spring.png (toolbar/spring.png) + skin/classic/global/toolbar/spring.png (toolbar/spring.png) diff --git a/toolkit/themes/linux/help/jar.mn b/toolkit/themes/linux/help/jar.mn index 77b3509fbd63..c3c62ce94ca0 100644 --- a/toolkit/themes/linux/help/jar.mn +++ b/toolkit/themes/linux/help/jar.mn @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -+ skin/classic/help/help.css + skin/classic/help/help.css diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index f881df59706e..cfab72dd71c4 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -4,34 +4,34 @@ toolkit.jar: #include ../../shared/mozapps.inc.mn -+ skin/classic/mozapps/update/updates.css (update/updates.css) -+ skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) -+ skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) + skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) + skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) * skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) -+ skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) -+ skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) -+ skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) -+ skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) -+ skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) -+ skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) -+ skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) -+ skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) -+ skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) -+ skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) -+ skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) -+ skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) * skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) -+ skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) -+ skin/classic/mozapps/extensions/heart.png (extensions/heart.png) -+ skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) -+ skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) -+ skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) -+ skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) -+ skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) -+ skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) -+ skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) + skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) + skin/classic/mozapps/extensions/heart.png (extensions/heart.png) + skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) + skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) + skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) + skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) + skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) + skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) + skin/classic/mozapps/update/updates.css (update/updates.css) + skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) #ifdef MOZ_PLACES -+ skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png) + skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png) #endif #if MOZ_BUILD_APP == browser diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build index 8cd5b827d782..6d9327a66cea 100644 --- a/toolkit/themes/moz.build +++ b/toolkit/themes/moz.build @@ -6,22 +6,25 @@ # Theme Selection # +# Shared (toolkit/themes/shared/) is always included. +# # MacOS X osx (toolkit/themes/osx) -# Windows windows (toolkit/themes/windows) -# GNOME/Linux windows (toolkit/themes/windows) + -# linux overrides (toolkit/themes/linux) +# Windows windows (toolkit/themes/windows) + +# non-mac (toolkit/themes/shared/non-mac) +# GNOME/Linux linux (toolkit/themes/linux) +# non-mac (toolkit/themes/shared/non-mac) # faststripe windows + faststripe (no native theme components) toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] if toolkit == 'cocoa': DIRS += ['osx'] +elif toolkit in ('gtk2', 'gtk3', 'qt'): + DIRS += ['linux'] else: DIRS += ['windows'] - if toolkit in ('gtk2', 'gtk3', 'qt'): - DIRS += ['linux'] - elif CONFIG['MOZ_THEME_FASTSTRIPE']: + if CONFIG['MOZ_THEME_FASTSTRIPE']: DIRS += ['faststripe/global'] with Files('**'): diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 19c49d4fbb02..129d7689403a 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -2,9 +2,9 @@ # 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/. -toolkit.jar: -% skin global classic/1.0 %skin/classic/global/ #include ../../shared/jar.inc.mn + +toolkit.jar: skin/classic/global/10pct_transparent_grey.png skin/classic/global/50pct_transparent_grey.png skin/classic/global/arrow.css diff --git a/toolkit/themes/osx/help/jar.mn b/toolkit/themes/osx/help/jar.mn index e452a2bc0112..6c3d5f8d2883 100644 --- a/toolkit/themes/osx/help/jar.mn +++ b/toolkit/themes/osx/help/jar.mn @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -% skin help classic/1.0 %skin/classic/help/ skin/classic/help/dropmark-nav.png skin/classic/help/help.css skin/classic/help/Toolbar.png diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index c9db82f0cc97..7e618b17e6a4 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -% skin mozapps classic/1.0 %skin/classic/mozapps/ #include ../../shared/mozapps.inc.mn skin/classic/mozapps/downloads/buttons.png (downloads/buttons.png) skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index f17d5b1e51e9..696590dd6f11 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -7,6 +7,10 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. +toolkit.jar: +% skin global classic/1.0 %skin/classic/global/ +% skin help classic/1.0 %skin/classic/help/ +% skin mozapps classic/1.0 %skin/classic/mozapps/ skin/classic/global/about.css (../../shared/about.css) skin/classic/global/aboutCache.css (../../shared/aboutCache.css) skin/classic/global/aboutCacheEntry.css (../../shared/aboutCacheEntry.css) @@ -40,3 +44,4 @@ skin/classic/global/reader/RM-Reading-List-24x24.svg (../../shared/reader/RM-Reading-List-24x24.svg) skin/classic/global/reader/RM-Type-Controls-24x24.svg (../../shared/reader/RM-Type-Controls-24x24.svg) skin/classic/global/reader/RM-Type-Controls-Arrow.svg (../../shared/reader/RM-Type-Controls-Arrow.svg) + diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn new file mode 100644 index 000000000000..1a9af34daf0f --- /dev/null +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -0,0 +1,183 @@ +# 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 is not a complete / proper jar manifest. It is conditionally included +# by the shared jar manifest, which in turn is included by the os-specific +# manifests. +# As a result, the source file paths are relative to the location of the +# actual manifests. + +#include jar.inc.mn + + skin/classic/global/arrow.css (../../windows/global/arrow.css) + skin/classic/global/customizeToolbar.css (../../windows/global/customizeToolbar.css) + skin/classic/global/datetimepicker.css (../../windows/global/datetimepicker.css) + skin/classic/global/dialog.css (../../windows/global/dialog.css) + skin/classic/global/expander.css (../../windows/global/expander.css) + skin/classic/global/filefield.css (../../windows/global/filefield.css) + skin/classic/global/globalBindings.xml (../../windows/global/globalBindings.xml) + skin/classic/global/linkTree.css (../../windows/global/linkTree.css) + skin/classic/global/passwordmgr.css (../../windows/global/passwordmgr.css) + skin/classic/global/progressmeter.css (../../windows/global/progressmeter.css) + skin/classic/global/resizer.css (../../windows/global/resizer.css) + skin/classic/global/richlistbox.css (../../windows/global/richlistbox.css) + skin/classic/global/scale.css (../../windows/global/scale.css) + skin/classic/global/scrollbars.css (../../windows/global/xulscrollbars.css) + skin/classic/global/spinbuttons.css (../../windows/global/spinbuttons.css) + skin/classic/global/tabprompts.css (../../windows/global/tabprompts.css) + skin/classic/global/wizard.css (../../windows/global/wizard.css) + + skin/classic/global/arrow/arrow-dn.gif (../../windows/global/arrow/arrow-dn.gif) + skin/classic/global/arrow/arrow-dn-dis.gif (../../windows/global/arrow/arrow-dn-dis.gif) + skin/classic/global/arrow/arrow-dn-hov.gif (../../windows/global/arrow/arrow-dn-hov.gif) + skin/classic/global/arrow/arrow-dn-sharp.gif (../../windows/global/arrow/arrow-dn-sharp.gif) + skin/classic/global/arrow/arrow-down.png (../../windows/global/arrow/arrow-down.png) + skin/classic/global/arrow/arrow-lft.gif (../../windows/global/arrow/arrow-lft.gif) + skin/classic/global/arrow/arrow-lft-dis.gif (../../windows/global/arrow/arrow-lft-dis.gif) + skin/classic/global/arrow/arrow-lft-sharp.gif (../../windows/global/arrow/arrow-lft-sharp.gif) + skin/classic/global/arrow/arrow-lft-sharp-end.gif (../../windows/global/arrow/arrow-lft-sharp-end.gif) + skin/classic/global/arrow/arrow-rit.gif (../../windows/global/arrow/arrow-rit.gif) + skin/classic/global/arrow/arrow-rit-dis.gif (../../windows/global/arrow/arrow-rit-dis.gif) + skin/classic/global/arrow/arrow-rit-sharp.gif (../../windows/global/arrow/arrow-rit-sharp.gif) + skin/classic/global/arrow/arrow-rit-sharp-end.gif (../../windows/global/arrow/arrow-rit-sharp-end.gif) + skin/classic/global/arrow/arrow-up.gif (../../windows/global/arrow/arrow-up.gif) + skin/classic/global/arrow/arrow-up-dis.gif (../../windows/global/arrow/arrow-up-dis.gif) + skin/classic/global/arrow/arrow-up-hov.gif (../../windows/global/arrow/arrow-up-hov.gif) + skin/classic/global/arrow/arrow-up-sharp.gif (../../windows/global/arrow/arrow-up-sharp.gif) + skin/classic/global/arrow/panelarrow-horizontal.svg (../../windows/global/arrow/panelarrow-horizontal.svg) + skin/classic/global/arrow/panelarrow-vertical.svg (../../windows/global/arrow/panelarrow-vertical.svg) + skin/classic/global/arrow/panelarrow-horizontal-themed.svg (../../windows/global/arrow/panelarrow-horizontal-themed.svg) + skin/classic/global/arrow/panelarrow-vertical-themed.svg (../../windows/global/arrow/panelarrow-vertical-themed.svg) + + skin/classic/global/checkbox/cbox-check.gif (../../windows/global/checkbox/cbox-check.gif) + skin/classic/global/checkbox/cbox-check-dis.gif (../../windows/global/checkbox/cbox-check-dis.gif) + skin/classic/global/console/console-error-caret.gif (../../windows/global/console/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (../../windows/global/console/console-error-dash.gif) + skin/classic/global/console/itemSelected.png (../../windows/global/console/itemSelected.png) +* skin/classic/global/dirListing/dirListing.css (../../windows/global/dirListing/dirListing.css) + skin/classic/global/dirListing/folder.png (../../windows/global/dirListing/folder.png) + skin/classic/global/dirListing/local.png (../../windows/global/dirListing/local.png) + skin/classic/global/dirListing/up.png (../../windows/global/dirListing/up.png) + skin/classic/global/icons/Close.gif (../../windows/global/icons/Close.gif) + skin/classic/global/icons/close.png (../../windows/global/icons/close.png) + skin/classic/global/icons/close@2x.png (../../windows/global/icons/close@2x.png) + skin/classic/global/icons/close-inverted.png (../../windows/global/icons/close-inverted.png) + skin/classic/global/icons/close-inverted@2x.png (../../windows/global/icons/close-inverted@2x.png) + skin/classic/global/icons/collapse.png (../../windows/global/icons/collapse.png) + skin/classic/global/icons/Error.png (../../windows/global/icons/Error.png) + skin/classic/global/icons/error-16.png (../../windows/global/icons/error-16.png) + skin/classic/global/icons/error-64.png (../../windows/global/icons/error-64.png) + skin/classic/global/icons/expand.png (../../windows/global/icons/expand.png) + skin/classic/global/icons/find-arrows.png (../../windows/global/icons/find-arrows.png) + skin/classic/global/icons/folder-item.png (../../windows/global/icons/folder-item.png) + skin/classic/global/icons/information-16.png (../../windows/global/icons/information-16.png) + skin/classic/global/icons/information-24.png (../../windows/global/icons/information-24.png) + skin/classic/global/icons/information-32.png (../../windows/global/icons/information-32.png) + skin/classic/global/icons/Minimize.gif (../../windows/global/icons/Minimize.gif) + skin/classic/global/icons/Print-preview.png (../../windows/global/icons/Print-preview.png) + skin/classic/global/icons/Portrait.png (../../windows/global/icons/Portrait.png) + skin/classic/global/icons/Landscape.png (../../windows/global/icons/Landscape.png) + skin/classic/global/icons/Question.png (../../windows/global/icons/Question.png) + skin/classic/global/icons/question-16.png (../../windows/global/icons/question-16.png) + skin/classic/global/icons/question-64.png (../../windows/global/icons/question-64.png) + skin/classic/global/icons/resizer-rtl.png (../../windows/global/icons/resizer-rtl.png) + skin/classic/global/icons/Restore.gif (../../windows/global/icons/Restore.gif) + skin/classic/global/icons/Search-close.png (../../windows/global/icons/Search-close.png) + skin/classic/global/icons/Search-glass.png (../../windows/global/icons/Search-glass.png) + skin/classic/global/icons/tabprompts-bgtexture.png (../../windows/global/icons/tabprompts-bgtexture.png) + skin/classic/global/icons/Warning.png (../../windows/global/icons/Warning.png) + skin/classic/global/icons/warning-large.png (../../windows/global/icons/warning-large.png) + skin/classic/global/icons/warning-16.png (../../windows/global/icons/warning-16.png) + skin/classic/global/icons/warning-64.png (../../windows/global/icons/warning-64.png) + skin/classic/global/icons/windowControls.png (../../windows/global/icons/windowControls.png) + skin/classic/global/media/TopLevelImageDocument.css (../../windows/global/media/TopLevelImageDocument.css) + skin/classic/global/media/TopLevelVideoDocument.css (../../windows/global/media/TopLevelVideoDocument.css) + skin/classic/global/media/imagedoc-lightnoise.png (../../windows/global/media/imagedoc-lightnoise.png) + skin/classic/global/media/imagedoc-darknoise.png (../../windows/global/media/imagedoc-darknoise.png) + skin/classic/global/media/videocontrols.css (../../windows/global/media/videocontrols.css) + skin/classic/global/media/pauseButton.png (../../windows/global/media/pauseButton.png) + skin/classic/global/media/playButton.png (../../windows/global/media/playButton.png) + skin/classic/global/media/muteButton.png (../../windows/global/media/muteButton.png) + skin/classic/global/media/unmuteButton.png (../../windows/global/media/unmuteButton.png) + skin/classic/global/media/noAudio.png (../../windows/global/media/noAudio.png) + skin/classic/global/media/fullscreenButton.png (../../windows/global/media/fullscreenButton.png) + skin/classic/global/media/scrubberThumb.png (../../windows/global/media/scrubberThumb.png) + skin/classic/global/media/scrubberThumbWide.png (../../windows/global/media/scrubberThumbWide.png) + skin/classic/global/media/throbber.png (../../windows/global/media/throbber.png) + skin/classic/global/media/stalled.png (../../windows/global/media/stalled.png) + skin/classic/global/media/volume-empty.png (../../windows/global/media/volume-empty.png) + skin/classic/global/media/volume-full.png (../../windows/global/media/volume-full.png) + skin/classic/global/media/error.png (../../windows/global/media/error.png) + skin/classic/global/media/clicktoplay-bgtexture.png (../../windows/global/media/clicktoplay-bgtexture.png) + skin/classic/global/media/videoClickToPlayButton.svg (../../windows/global/media/videoClickToPlayButton.svg) + skin/classic/global/printpreview/arrow-left.png (../../windows/global/printpreview/arrow-left.png) + skin/classic/global/printpreview/arrow-left-end.png (../../windows/global/printpreview/arrow-left-end.png) + skin/classic/global/printpreview/arrow-right.png (../../windows/global/printpreview/arrow-right.png) + skin/classic/global/printpreview/arrow-right-end.png (../../windows/global/printpreview/arrow-right-end.png) + skin/classic/global/radio/radio-check.gif (../../windows/global/radio/radio-check.gif) + skin/classic/global/radio/radio-check-dis.gif (../../windows/global/radio/radio-check-dis.gif) + skin/classic/global/scrollbar/slider.gif (../../windows/global/scrollbar/slider.gif) + skin/classic/global/splitter/grip-bottom.gif (../../windows/global/splitter/grip-bottom.gif) + skin/classic/global/splitter/grip-top.gif (../../windows/global/splitter/grip-top.gif) + skin/classic/global/splitter/grip-left.gif (../../windows/global/splitter/grip-left.gif) + skin/classic/global/splitter/grip-right.gif (../../windows/global/splitter/grip-right.gif) + skin/classic/global/toolbar/chevron.gif (../../windows/global/toolbar/chevron.gif) + skin/classic/global/toolbar/chevron-inverted.png (../../windows/global/toolbar/chevron-inverted.png) + skin/classic/global/tree/columnpicker.gif (../../windows/global/tree/columnpicker.gif) + skin/classic/global/tree/sort-asc.png (../../windows/global/tree/sort-asc.png) + skin/classic/global/tree/sort-dsc.png (../../windows/global/tree/sort-dsc.png) + skin/classic/global/tree/sort-asc-classic.png (../../windows/global/tree/sort-asc-classic.png) + skin/classic/global/tree/sort-dsc-classic.png (../../windows/global/tree/sort-dsc-classic.png) + skin/classic/global/tree/twisty-clsd.png (../../windows/global/tree/twisty-clsd.png) + skin/classic/global/tree/twisty-clsd-rtl.png (../../windows/global/tree/twisty-clsd-rtl.png) + skin/classic/global/tree/twisty-clsd-hover.png (../../windows/global/tree/twisty-clsd-hover.png) + skin/classic/global/tree/twisty-clsd-hover-rtl.png (../../windows/global/tree/twisty-clsd-hover-rtl.png) + skin/classic/global/tree/twisty-open.png (../../windows/global/tree/twisty-open.png) + skin/classic/global/tree/twisty-open-rtl.png (../../windows/global/tree/twisty-open-rtl.png) + skin/classic/global/tree/twisty-open-hover.png (../../windows/global/tree/twisty-open-hover.png) + skin/classic/global/tree/twisty-open-hover-rtl.png (../../windows/global/tree/twisty-open-hover-rtl.png) + + skin/classic/help/Toolbar.png (../../windows/help/Toolbar.png) + skin/classic/help/Toolbar-rtl.png (../../windows/help/Toolbar-rtl.png) + skin/classic/help/helpFileLayout.css (../../windows/help/helpFileLayout.css) + skin/classic/help/Weblink.png (../../windows/help/Weblink.png) + skin/classic/help/Weblink-rtl.png (../../windows/help/Weblink-rtl.png) + + skin/classic/mozapps/downloads/downloadButtons.png (../../windows/mozapps/downloads/downloadButtons.png) + skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css) + skin/classic/mozapps/extensions/about.css (../../windows/mozapps/extensions/about.css) + skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/extensions/blocklist.css) + skin/classic/mozapps/extensions/update.css (../../windows/mozapps/extensions/update.css) + skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/extensions/discover-logo.png) + skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/extensions/experimentGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/extensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/extensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/extensions/cancel.png) + skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/extensions/eula.css) + skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css) +#ifdef MOZ_PLACES + skin/classic/mozapps/places/defaultFavicon@2x.png (../../windows/mozapps/places/defaultFavicon@2x.png) +#endif + skin/classic/mozapps/plugins/pluginBlocked-64.png (../../windows/mozapps/plugins/pluginBlocked-64.png) + skin/classic/mozapps/plugins/pluginHelp-16.png (../../windows/mozapps/plugins/pluginHelp-16.png) + skin/classic/mozapps/profile/profileSelection.css (../../windows/mozapps/profile/profileSelection.css) + skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) +* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) + +#if MOZ_BUILD_APP == browser +[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: +#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES +[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: +#endif +% override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif +% override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif +% override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png +% override chrome://mozapps/skin/extensions/category-experiments.png chrome://mozapps/skin/extensions/experimentGeneric.png +% override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg +% override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png +% override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png +% override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png +% override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png +% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png + diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 1dbb8e64b0db..ca257fd1b23b 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -2,190 +2,64 @@ # 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/non-mac.jar.inc.mn + toolkit.jar: -% skin global classic/1.0 %skin/classic/global/ -#include ../../shared/jar.inc.mn - skin/classic/global/arrow.css * skin/classic/global/autocomplete.css skin/classic/global/button.css skin/classic/global/checkbox.css skin/classic/global/colorpicker.css skin/classic/global/commonDialog.css - skin/classic/global/customizeToolbar.css - skin/classic/global/datetimepicker.css - skin/classic/global/dialog.css skin/classic/global/dropmarker.css - skin/classic/global/expander.css - skin/classic/global/filefield.css skin/classic/global/filepicker.css + skin/classic/global/Filepicker.png (filepicker/Filepicker.png) skin/classic/global/findBar.css * skin/classic/global/global.css - skin/classic/global/globalBindings.xml skin/classic/global/groupbox.css - skin/classic/global/linkTree.css skin/classic/global/listbox.css * skin/classic/global/menu.css skin/classic/global/menulist.css skin/classic/global/netError.css skin/classic/global/numberbox.css * skin/classic/global/notification.css - skin/classic/global/passwordmgr.css * skin/classic/global/popup.css skin/classic/global/preferences.css skin/classic/global/printPageSetup.css skin/classic/global/printPreview.css - skin/classic/global/progressmeter.css skin/classic/global/radio.css - skin/classic/global/resizer.css - skin/classic/global/richlistbox.css - skin/classic/global/scale.css - skin/classic/global/scrollbars.css (xulscrollbars.css) skin/classic/global/scrollbox.css - skin/classic/global/spinbuttons.css skin/classic/global/splitter.css skin/classic/global/tabbox.css - skin/classic/global/tabprompts.css skin/classic/global/textbox.css skin/classic/global/toolbar.css skin/classic/global/toolbarbutton.css * skin/classic/global/tree.css - skin/classic/global/wizard.css skin/classic/global/alerts/alert.css (alerts/alert.css) - skin/classic/global/arrow/arrow-dn.gif (arrow/arrow-dn.gif) - skin/classic/global/arrow/arrow-dn-dis.gif (arrow/arrow-dn-dis.gif) - skin/classic/global/arrow/arrow-dn-hov.gif (arrow/arrow-dn-hov.gif) - skin/classic/global/arrow/arrow-dn-sharp.gif (arrow/arrow-dn-sharp.gif) - skin/classic/global/arrow/arrow-down.png (arrow/arrow-down.png) - skin/classic/global/arrow/arrow-lft.gif (arrow/arrow-lft.gif) - skin/classic/global/arrow/arrow-lft-dis.gif (arrow/arrow-lft-dis.gif) - skin/classic/global/arrow/arrow-lft-sharp.gif (arrow/arrow-lft-sharp.gif) - skin/classic/global/arrow/arrow-lft-sharp-end.gif (arrow/arrow-lft-sharp-end.gif) - skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif) - skin/classic/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif) - skin/classic/global/arrow/arrow-rit-sharp.gif (arrow/arrow-rit-sharp.gif) - skin/classic/global/arrow/arrow-rit-sharp-end.gif (arrow/arrow-rit-sharp-end.gif) - skin/classic/global/arrow/arrow-up.gif (arrow/arrow-up.gif) - skin/classic/global/arrow/arrow-up-dis.gif (arrow/arrow-up-dis.gif) - skin/classic/global/arrow/arrow-up-hov.gif (arrow/arrow-up-hov.gif) - skin/classic/global/arrow/arrow-up-sharp.gif (arrow/arrow-up-sharp.gif) - skin/classic/global/arrow/panelarrow-horizontal.svg (arrow/panelarrow-horizontal.svg) - skin/classic/global/arrow/panelarrow-vertical.svg (arrow/panelarrow-vertical.svg) - skin/classic/global/arrow/panelarrow-horizontal-themed.svg (arrow/panelarrow-horizontal-themed.svg) - skin/classic/global/arrow/panelarrow-vertical-themed.svg (arrow/panelarrow-vertical-themed.svg) - skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) - skin/classic/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif) * skin/classic/global/console/console.css (console/console.css) skin/classic/global/console/console-toolbar.png (console/console-toolbar.png) - skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) - skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) - skin/classic/global/console/itemSelected.png (console/itemSelected.png) -* skin/classic/global/dirListing/dirListing.css (dirListing/dirListing.css) - skin/classic/global/dirListing/folder.png (dirListing/folder.png) - skin/classic/global/dirListing/local.png (dirListing/local.png) skin/classic/global/dirListing/remote.png (dirListing/remote.png) - skin/classic/global/dirListing/up.png (dirListing/up.png) - skin/classic/global/Filepicker.png (filepicker/Filepicker.png) - skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg) skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) - skin/classic/global/icons/Close.gif (icons/Close.gif) - skin/classic/global/icons/close.png (icons/close.png) - skin/classic/global/icons/close@2x.png (icons/close@2x.png) skin/classic/global/icons/close-XPVista7.png (icons/close-XPVista7.png) skin/classic/global/icons/close-XPVista7@2x.png (icons/close-XPVista7@2x.png) - skin/classic/global/icons/close-inverted.png (icons/close-inverted.png) - skin/classic/global/icons/close-inverted@2x.png (icons/close-inverted@2x.png) skin/classic/global/icons/close-inverted-XPVista7.png (icons/close-inverted-XPVista7.png) skin/classic/global/icons/close-inverted-XPVista7@2x.png (icons/close-inverted-XPVista7@2x.png) - skin/classic/global/icons/collapse.png (icons/collapse.png) - skin/classic/global/icons/Error.png (icons/Error.png) - skin/classic/global/icons/error-16.png (icons/error-16.png) - skin/classic/global/icons/error-64.png (icons/error-64.png) - skin/classic/global/icons/expand.png (icons/expand.png) - skin/classic/global/icons/find-arrows.png (icons/find-arrows.png) - skin/classic/global/icons/folder-item.png (icons/folder-item.png) - skin/classic/global/icons/information-16.png (icons/information-16.png) - skin/classic/global/icons/information-24.png (icons/information-24.png) - skin/classic/global/icons/information-32.png (icons/information-32.png) skin/classic/global/icons/loading_16.png (icons/loading_16.png) - skin/classic/global/icons/Minimize.gif (icons/Minimize.gif) - skin/classic/global/icons/Print-preview.png (icons/Print-preview.png) - skin/classic/global/icons/Portrait.png (icons/Portrait.png) - skin/classic/global/icons/Landscape.png (icons/Landscape.png) - skin/classic/global/icons/Question.png (icons/Question.png) - skin/classic/global/icons/question-16.png (icons/question-16.png) - skin/classic/global/icons/question-64.png (icons/question-64.png) skin/classic/global/icons/resizer.png (icons/resizer.png) - skin/classic/global/icons/resizer-rtl.png (icons/resizer-rtl.png) - skin/classic/global/icons/Restore.gif (icons/Restore.gif) - skin/classic/global/icons/Search-close.png (icons/Search-close.png) - skin/classic/global/icons/Search-glass.png (icons/Search-glass.png) skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) - skin/classic/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png) - skin/classic/global/icons/Warning.png (icons/Warning.png) - skin/classic/global/icons/warning-large.png (icons/warning-large.png) - skin/classic/global/icons/warning-16.png (icons/warning-16.png) - skin/classic/global/icons/warning-64.png (icons/warning-64.png) - skin/classic/global/icons/windowControls.png (icons/windowControls.png) skin/classic/global/icons/webapps-16.png (icons/webapps-16.png) skin/classic/global/icons/webapps-64.png (icons/webapps-64.png) - skin/classic/global/media/TopLevelImageDocument.css (media/TopLevelImageDocument.css) - skin/classic/global/media/TopLevelVideoDocument.css (media/TopLevelVideoDocument.css) - skin/classic/global/media/imagedoc-lightnoise.png (media/imagedoc-lightnoise.png) - skin/classic/global/media/imagedoc-darknoise.png (media/imagedoc-darknoise.png) - skin/classic/global/media/videocontrols.css (media/videocontrols.css) - skin/classic/global/media/pauseButton.png (media/pauseButton.png) - skin/classic/global/media/playButton.png (media/playButton.png) - skin/classic/global/media/muteButton.png (media/muteButton.png) - skin/classic/global/media/unmuteButton.png (media/unmuteButton.png) - skin/classic/global/media/noAudio.png (media/noAudio.png) - skin/classic/global/media/fullscreenButton.png (media/fullscreenButton.png) - skin/classic/global/media/scrubberThumb.png (media/scrubberThumb.png) - skin/classic/global/media/scrubberThumbWide.png (media/scrubberThumbWide.png) - skin/classic/global/media/throbber.png (media/throbber.png) - skin/classic/global/media/stalled.png (media/stalled.png) - skin/classic/global/media/volume-empty.png (media/volume-empty.png) - skin/classic/global/media/volume-full.png (media/volume-full.png) - skin/classic/global/media/error.png (media/error.png) - skin/classic/global/media/clicktoplay-bgtexture.png (media/clicktoplay-bgtexture.png) - skin/classic/global/media/videoClickToPlayButton.svg (media/videoClickToPlayButton.svg) * skin/classic/global/in-content/common.css (in-content/common.css) * skin/classic/global/in-content/info-pages.css (in-content/info-pages.css) - skin/classic/global/printpreview/arrow-left.png (printpreview/arrow-left.png) - skin/classic/global/printpreview/arrow-left-end.png (printpreview/arrow-left-end.png) - skin/classic/global/printpreview/arrow-right.png (printpreview/arrow-right.png) - skin/classic/global/printpreview/arrow-right-end.png (printpreview/arrow-right-end.png) - skin/classic/global/radio/radio-check.gif (radio/radio-check.gif) - skin/classic/global/radio/radio-check-dis.gif (radio/radio-check-dis.gif) - skin/classic/global/scrollbar/slider.gif (scrollbar/slider.gif) - skin/classic/global/splitter/grip-bottom.gif (splitter/grip-bottom.gif) - skin/classic/global/splitter/grip-top.gif (splitter/grip-top.gif) - skin/classic/global/splitter/grip-left.gif (splitter/grip-left.gif) - skin/classic/global/splitter/grip-right.gif (splitter/grip-right.gif) - skin/classic/global/toolbar/chevron.gif (toolbar/chevron.gif) - skin/classic/global/toolbar/chevron-inverted.png (toolbar/chevron-inverted.png) skin/classic/global/toolbar/spring.png (toolbar/spring.png) - skin/classic/global/tree/columnpicker.gif (tree/columnpicker.gif) - skin/classic/global/tree/sort-asc.png (tree/sort-asc.png) - skin/classic/global/tree/sort-dsc.png (tree/sort-dsc.png) - skin/classic/global/tree/sort-asc-classic.png (tree/sort-asc-classic.png) - skin/classic/global/tree/sort-dsc-classic.png (tree/sort-dsc-classic.png) - skin/classic/global/tree/twisty-clsd.png (tree/twisty-clsd.png) - skin/classic/global/tree/twisty-clsd-rtl.png (tree/twisty-clsd-rtl.png) - skin/classic/global/tree/twisty-clsd-hover.png (tree/twisty-clsd-hover.png) - skin/classic/global/tree/twisty-clsd-hover-rtl.png (tree/twisty-clsd-hover-rtl.png) - skin/classic/global/tree/twisty-open.png (tree/twisty-open.png) - skin/classic/global/tree/twisty-open-rtl.png (tree/twisty-open-rtl.png) - skin/classic/global/tree/twisty-open-hover.png (tree/twisty-open-hover.png) - skin/classic/global/tree/twisty-open-hover-rtl.png (tree/twisty-open-hover-rtl.png) -#ifdef XP_WIN skin/classic/global/console/console-toolbar-XP.png (console/console-toolbar-XP.png) skin/classic/global/dirListing/folder-XP.png (dirListing/folder-XP.png) skin/classic/global/dirListing/local-XP.png (dirListing/local-XP.png) skin/classic/global/dirListing/remote-XP.png (dirListing/remote-XP.png) skin/classic/global/dirListing/up-XP.png (dirListing/up-XP.png) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) skin/classic/global/icons/autoscroll-XP.png (icons/autoscroll-XP.png) skin/classic/global/icons/blacklist_favicon-XP.png (icons/blacklist_favicon-XP.png) skin/classic/global/icons/blacklist_large-XP.png (icons/blacklist_large-XP.png) @@ -268,12 +142,3 @@ toolkit.jar: % override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-XPVista7@2x.png osversion<=6.1 % override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-XPVista7.png osversion<=6.1 % override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-XPVista7@2x.png osversion<=6.1 -#endif - -#if MOZ_BUILD_APP == browser -[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: -#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES -[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: -#endif -% override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif -% override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif diff --git a/toolkit/themes/windows/help/jar.mn b/toolkit/themes/windows/help/jar.mn index d720d74514c6..c3c62ce94ca0 100644 --- a/toolkit/themes/windows/help/jar.mn +++ b/toolkit/themes/windows/help/jar.mn @@ -3,10 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -% skin help classic/1.0 %skin/classic/help/ skin/classic/help/help.css - skin/classic/help/Toolbar.png - skin/classic/help/Toolbar-rtl.png - skin/classic/help/helpFileLayout.css - skin/classic/help/Weblink.png - skin/classic/help/Weblink-rtl.png diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 0c228c2a44db..05704c94be6d 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -3,57 +3,38 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -% skin mozapps classic/1.0 %skin/classic/mozapps/ #include ../../shared/mozapps.inc.mn - skin/classic/mozapps/downloads/downloadButtons.png (downloads/downloadButtons.png) skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) - skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css) skin/classic/mozapps/extensions/about.css (extensions/about.css) - skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) * skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) * skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) - skin/classic/mozapps/extensions/update.css (extensions/update.css) skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) - skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) - skin/classic/mozapps/extensions/experimentGeneric.png (extensions/experimentGeneric.png) skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png) skin/classic/mozapps/extensions/heart.png (extensions/heart.png) - skin/classic/mozapps/extensions/eula.css (extensions/eula.css) * skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) - skin/classic/mozapps/handling/handling.css (handling/handling.css) skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png) skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) #ifdef MOZ_PLACES skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png) - skin/classic/mozapps/places/defaultFavicon@2x.png (places/defaultFavicon@2x.png) #endif skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) - skin/classic/mozapps/plugins/pluginBlocked-64.png (plugins/pluginBlocked-64.png) skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) - skin/classic/mozapps/plugins/pluginHelp-16.png (plugins/pluginHelp-16.png) skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) - skin/classic/mozapps/profile/profileSelection.css (profile/profileSelection.css) - skin/classic/mozapps/update/downloadButtons.png (update/downloadButtons.png) skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) -* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) -#ifdef XP_WIN skin/classic/mozapps/downloads/downloadButtons-XP.png (downloads/downloadButtons-XP.png) skin/classic/mozapps/downloads/downloadIcon-XP.png (downloads/downloadIcon-XP.png) skin/classic/mozapps/extensions/category-discover-XP.png (extensions/category-discover-XP.png) @@ -90,17 +71,3 @@ toolkit.jar: % override chrome://mozapps/skin/plugins/pluginGeneric-16.png chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png osversion<6 % override chrome://mozapps/skin/profile/profileicon.png chrome://mozapps/skin/profile/profileicon-XP.png osversion<6 % override chrome://mozapps/skin/update/downloadButtons.png chrome://mozapps/skin/update/downloadButtons-XP.png osversion<6 -#endif - -#if MOZ_BUILD_APP == browser -[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: -#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES -[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: -#endif -% override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png -% override chrome://mozapps/skin/extensions/category-experiments.png chrome://mozapps/skin/extensions/experimentGeneric.png -% override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg -% override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png -% override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png -% override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png -% override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png