From fd9d8c20d21f527d99bf9ce3d3f0f25f85fb029c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 12:49:23 +0100 Subject: Remove Windows XP and Windows Vista theme components and resources. --- browser/installer/allowed-dupes.mn | 4 +- browser/themes/windows/Info-XP.png | Bin 590 -> 0 bytes browser/themes/windows/Privacy-16-XP.png | Bin 799 -> 0 bytes browser/themes/windows/Toolbar-XP.png | Bin 19638 -> 0 bytes browser/themes/windows/Toolbar-aero.png | Bin 18276 -> 0 bytes browser/themes/windows/Toolbar-aero@2x.png | Bin 47581 -> 0 bytes browser/themes/windows/Toolbar-lunaSilver.png | Bin 19034 -> 0 bytes browser/themes/windows/Toolbar-win7.png | Bin 0 -> 18276 bytes browser/themes/windows/Toolbar-win7@2x.png | Bin 0 -> 47581 bytes browser/themes/windows/actionicon-tab-XPVista7.png | Bin 421 -> 0 bytes browser/themes/windows/actionicon-tab-win7.png | Bin 0 -> 421 bytes browser/themes/windows/browser-aero.css | 17 +- browser/themes/windows/browser.css | 193 ++-------- browser/themes/windows/customizableui/panelUI.css | 26 +- browser/themes/windows/devedition.css | 9 +- .../windows/downloads/allDownloadsViewOverlay.css | 52 ++- .../windows/downloads/download-glow-XPVista7.png | Bin 494 -> 0 bytes .../downloads/download-glow-menuPanel-XPVista7.png | Bin 893 -> 0 bytes .../downloads/download-glow-menuPanel-win7.png | Bin 0 -> 893 bytes .../windows/downloads/download-glow-win7.png | Bin 0 -> 494 bytes browser/themes/windows/downloads/indicator.css | 8 +- browser/themes/windows/feeds/feedIcon-XP.png | Bin 1770 -> 0 bytes browser/themes/windows/feeds/feedIcon16-XP.png | Bin 762 -> 0 bytes browser/themes/windows/jar.mn | 137 +++---- browser/themes/windows/livemark-folder-XP.png | Bin 667 -> 0 bytes browser/themes/windows/menu-back-XP.png | Bin 341 -> 0 bytes browser/themes/windows/menu-forward-XP.png | Bin 342 -> 0 bytes browser/themes/windows/pageInfo-XP.png | Bin 7739 -> 0 bytes browser/themes/windows/places/allBookmarks-XP.png | Bin 504 -> 0 bytes .../windows/places/autocomplete-star-XPVista7.png | Bin 813 -> 0 bytes .../windows/places/autocomplete-star-win7.png | Bin 0 -> 813 bytes browser/themes/windows/places/bookmarksMenu-XP.png | Bin 334 -> 0 bytes .../themes/windows/places/bookmarksToolbar-XP.png | Bin 229 -> 0 bytes .../places/bookmarksToolbar-menuPanel-XP.png | Bin 689 -> 0 bytes browser/themes/windows/places/calendar-XP.png | Bin 559 -> 0 bytes browser/themes/windows/places/history-XP.png | Bin 821 -> 0 bytes .../themes/windows/places/libraryToolbar-XP.png | Bin 2037 -> 0 bytes browser/themes/windows/places/organizer.css | 58 +-- browser/themes/windows/places/places.css | 18 +- browser/themes/windows/places/query-XP.png | Bin 612 -> 0 bytes browser/themes/windows/places/starred48-XP.png | Bin 1848 -> 0 bytes browser/themes/windows/places/tag-XP.png | Bin 480 -> 0 bytes .../themes/windows/places/toolbarDropMarker-XP.png | Bin 219 -> 0 bytes .../themes/windows/places/unsortedBookmarks-XP.png | Bin 712 -> 0 bytes .../themes/windows/preferences/alwaysAsk-XP.png | Bin 408 -> 0 bytes .../themes/windows/preferences/application-XP.png | Bin 388 -> 0 bytes browser/themes/windows/preferences/saveFile-XP.png | Bin 740 -> 0 bytes .../privatebrowsing-mask-tabstrip-XPVista7.png | Bin 949 -> 0 bytes .../windows/privatebrowsing-mask-tabstrip-win7.png | Bin 0 -> 949 bytes ...privatebrowsing-mask-titlebar-XPVista7-tall.png | Bin 940 -> 0 bytes .../privatebrowsing-mask-titlebar-XPVista7.png | Bin 860 -> 0 bytes .../privatebrowsing-mask-titlebar-win7-tall.png | Bin 0 -> 940 bytes .../windows/privatebrowsing-mask-titlebar-win7.png | Bin 0 -> 860 bytes browser/themes/windows/reload-stop-go-XPVista7.png | Bin 1944 -> 0 bytes .../themes/windows/reload-stop-go-XPVista7@2x.png | Bin 3661 -> 0 bytes browser/themes/windows/reload-stop-go-win7.png | Bin 0 -> 1944 bytes browser/themes/windows/reload-stop-go-win7@2x.png | Bin 0 -> 3661 bytes .../themes/windows/sync-horizontalbar-XPVista7.png | Bin 719 -> 0 bytes .../windows/sync-horizontalbar-XPVista7@2x.png | Bin 1702 -> 0 bytes browser/themes/windows/sync-horizontalbar-win7.png | Bin 0 -> 719 bytes .../themes/windows/sync-horizontalbar-win7@2x.png | Bin 0 -> 1702 bytes .../syncProgress-horizontalbar-XPVista7.png | Bin 11892 -> 0 bytes .../syncProgress-horizontalbar-XPVista7@2x.png | Bin 27608 -> 0 bytes .../windows/syncProgress-horizontalbar-win7.png | Bin 0 -> 11892 bytes .../windows/syncProgress-horizontalbar-win7@2x.png | Bin 0 -> 27608 bytes .../windows/syncProgress-toolbar-XPVista7.png | Bin 13293 -> 0 bytes .../windows/syncProgress-toolbar-XPVista7@2x.png | Bin 33662 -> 0 bytes .../themes/windows/syncProgress-toolbar-win7.png | Bin 0 -> 13293 bytes .../windows/syncProgress-toolbar-win7@2x.png | Bin 0 -> 33662 bytes .../themes/windows/tabbrowser/newtab-XPVista7.svg | 16 - .../tabbrowser/newtab-inverted-XPVista7.svg | 13 - .../windows/tabbrowser/newtab-inverted-win7.svg | 13 + browser/themes/windows/tabbrowser/newtab-win7.svg | 16 + .../windows/tabbrowser/tab-arrow-left-XPVista7.svg | 13 - .../windows/tabbrowser/tab-arrow-left-win7.svg | 13 + .../toolbarbutton-dropdown-arrow-XPVista7.png | Bin 208 -> 0 bytes .../windows/toolbarbutton-dropdown-arrow-win7.png | Bin 0 -> 208 bytes .../windows/urlbar-history-dropmarker-XPVista7.png | Bin 479 -> 0 bytes .../urlbar-history-dropmarker-XPVista7@2x.png | Bin 788 -> 0 bytes .../windows/urlbar-history-dropmarker-win7.png | Bin 0 -> 479 bytes .../windows/urlbar-history-dropmarker-win7@2x.png | Bin 0 -> 788 bytes browser/themes/windows/windowsShared.inc | 2 - .../themes/windows/global/dirListing/folder-XP.png | Bin 446 -> 0 bytes .../themes/windows/global/dirListing/local-XP.png | Bin 688 -> 0 bytes .../themes/windows/global/dirListing/remote-XP.png | Bin 558 -> 0 bytes toolkit/themes/windows/global/dirListing/up-XP.png | Bin 607 -> 0 bytes toolkit/themes/windows/global/global.css | 8 +- .../themes/windows/global/icons/Landscape-XP.png | Bin 801 -> 0 bytes .../themes/windows/global/icons/Portrait-XP.png | Bin 837 -> 0 bytes .../windows/global/icons/Print-preview-XP.png | Bin 715 -> 0 bytes .../themes/windows/global/icons/Question-XP.png | Bin 1693 -> 0 bytes .../windows/global/icons/Search-close-XP.png | Bin 586 -> 0 bytes .../windows/global/icons/Search-glass-XP.png | Bin 1448 -> 0 bytes toolkit/themes/windows/global/icons/Warning-XP.png | Bin 1269 -> 0 bytes .../themes/windows/global/icons/autoscroll-XP.png | Bin 2305 -> 0 bytes .../windows/global/icons/blacklist_favicon-XP.png | Bin 603 -> 0 bytes .../windows/global/icons/blacklist_large-XP.png | Bin 3587 -> 0 bytes .../themes/windows/global/icons/close-XPVista7.png | Bin 931 -> 0 bytes .../windows/global/icons/close-XPVista7@2x.png | Bin 2031 -> 0 bytes .../global/icons/close-inverted-XPVista7.png | Bin 855 -> 0 bytes .../global/icons/close-inverted-XPVista7@2x.png | Bin 1865 -> 0 bytes .../windows/global/icons/close-inverted-win7.png | Bin 0 -> 855 bytes .../global/icons/close-inverted-win7@2x.png | Bin 0 -> 1865 bytes toolkit/themes/windows/global/icons/close-win7.png | Bin 0 -> 931 bytes .../themes/windows/global/icons/close-win7@2x.png | Bin 0 -> 2031 bytes .../themes/windows/global/icons/error-16-XP.png | Bin 722 -> 0 bytes .../themes/windows/global/icons/error-64-XP.png | Bin 3914 -> 0 bytes .../themes/windows/global/icons/folder-item-XP.png | Bin 1602 -> 0 bytes .../windows/global/icons/information-16-XP.png | Bin 769 -> 0 bytes .../windows/global/icons/information-24-XP.png | Bin 1244 -> 0 bytes .../windows/global/icons/information-32-XP.png | Bin 1609 -> 0 bytes .../themes/windows/global/icons/question-16-XP.png | Bin 854 -> 0 bytes .../themes/windows/global/icons/question-64-XP.png | Bin 4204 -> 0 bytes .../themes/windows/global/icons/sslWarning-XP.png | Bin 3860 -> 0 bytes .../themes/windows/global/icons/warning-16-XP.png | Bin 563 -> 0 bytes .../themes/windows/global/icons/warning-64-XP.png | Bin 3525 -> 0 bytes .../windows/global/icons/warning-large-XP.png | Bin 2125 -> 0 bytes .../windows/global/icons/windowControls-XP.png | Bin 2060 -> 0 bytes toolkit/themes/windows/global/jar.mn | 104 +----- toolkit/themes/windows/global/listbox.css | 113 +++--- toolkit/themes/windows/global/menu.css | 16 +- toolkit/themes/windows/global/menulist.css | 56 ++- toolkit/themes/windows/global/popup.css | 4 +- toolkit/themes/windows/global/textbox.css | 6 +- .../themes/windows/global/toolbar/spring-XP.png | Bin 440 -> 0 bytes toolkit/themes/windows/global/toolbarbutton.css | 8 +- toolkit/themes/windows/global/tree.css | 393 ++++++++++----------- toolkit/themes/windows/global/tree/sort-asc-XP.png | Bin 161 -> 0 bytes toolkit/themes/windows/global/tree/sort-dsc-XP.png | Bin 155 -> 0 bytes .../themes/windows/global/tree/twisty-Vista78.svg | 39 -- toolkit/themes/windows/global/tree/twisty-XP.svg | 33 -- .../themes/windows/global/tree/twisty-preWin10.svg | 39 ++ .../mozapps/downloads/downloadButtons-XP.png | Bin 3243 -> 0 bytes .../windows/mozapps/downloads/downloadIcon-XP.png | Bin 1376 -> 0 bytes toolkit/themes/windows/mozapps/jar.mn | 34 +- .../windows/mozapps/plugins/pluginBlocked-XP.png | Bin 1230 -> 0 bytes .../mozapps/plugins/pluginGeneric-16-XP.png | Bin 544 -> 0 bytes .../windows/mozapps/plugins/pluginGeneric-XP.png | Bin 895 -> 0 bytes .../windows/mozapps/profile/profileicon-XP.png | Bin 826 -> 0 bytes .../windows/mozapps/update/downloadButtons-XP.png | Bin 3243 -> 0 bytes .../webextensions/category-available-XP.png | Bin 1671 -> 0 bytes .../mozapps/webextensions/category-discover-XP.png | Bin 1324 -> 0 bytes .../mozapps/webextensions/category-plugins-XP.png | Bin 886 -> 0 bytes .../mozapps/webextensions/category-recent-XP.png | Bin 1642 -> 0 bytes .../webextensions/extensionGeneric-16-XP.png | Bin 398 -> 0 bytes .../mozapps/webextensions/localeGeneric-XP.png | Bin 2410 -> 0 bytes .../mozapps/webextensions/themeGeneric-16-XP.png | Bin 842 -> 0 bytes .../mozapps/webextensions/themeGeneric-XP.png | Bin 2185 -> 0 bytes 148 files changed, 535 insertions(+), 926 deletions(-) delete mode 100644 browser/themes/windows/Info-XP.png delete mode 100644 browser/themes/windows/Privacy-16-XP.png delete mode 100644 browser/themes/windows/Toolbar-XP.png delete mode 100644 browser/themes/windows/Toolbar-aero.png delete mode 100644 browser/themes/windows/Toolbar-aero@2x.png delete mode 100644 browser/themes/windows/Toolbar-lunaSilver.png create mode 100644 browser/themes/windows/Toolbar-win7.png create mode 100644 browser/themes/windows/Toolbar-win7@2x.png delete mode 100644 browser/themes/windows/actionicon-tab-XPVista7.png create mode 100644 browser/themes/windows/actionicon-tab-win7.png delete mode 100644 browser/themes/windows/downloads/download-glow-XPVista7.png delete mode 100644 browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png create mode 100644 browser/themes/windows/downloads/download-glow-menuPanel-win7.png create mode 100644 browser/themes/windows/downloads/download-glow-win7.png delete mode 100644 browser/themes/windows/feeds/feedIcon-XP.png delete mode 100644 browser/themes/windows/feeds/feedIcon16-XP.png delete mode 100644 browser/themes/windows/livemark-folder-XP.png delete mode 100644 browser/themes/windows/menu-back-XP.png delete mode 100644 browser/themes/windows/menu-forward-XP.png delete mode 100644 browser/themes/windows/pageInfo-XP.png delete mode 100644 browser/themes/windows/places/allBookmarks-XP.png delete mode 100644 browser/themes/windows/places/autocomplete-star-XPVista7.png create mode 100644 browser/themes/windows/places/autocomplete-star-win7.png delete mode 100644 browser/themes/windows/places/bookmarksMenu-XP.png delete mode 100644 browser/themes/windows/places/bookmarksToolbar-XP.png delete mode 100644 browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png delete mode 100644 browser/themes/windows/places/calendar-XP.png delete mode 100644 browser/themes/windows/places/history-XP.png delete mode 100644 browser/themes/windows/places/libraryToolbar-XP.png delete mode 100644 browser/themes/windows/places/query-XP.png delete mode 100644 browser/themes/windows/places/starred48-XP.png delete mode 100644 browser/themes/windows/places/tag-XP.png delete mode 100644 browser/themes/windows/places/toolbarDropMarker-XP.png delete mode 100644 browser/themes/windows/places/unsortedBookmarks-XP.png delete mode 100644 browser/themes/windows/preferences/alwaysAsk-XP.png delete mode 100644 browser/themes/windows/preferences/application-XP.png delete mode 100644 browser/themes/windows/preferences/saveFile-XP.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png create mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png create mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png create mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7.png delete mode 100644 browser/themes/windows/reload-stop-go-XPVista7.png delete mode 100644 browser/themes/windows/reload-stop-go-XPVista7@2x.png create mode 100644 browser/themes/windows/reload-stop-go-win7.png create mode 100644 browser/themes/windows/reload-stop-go-win7@2x.png delete mode 100644 browser/themes/windows/sync-horizontalbar-XPVista7.png delete mode 100644 browser/themes/windows/sync-horizontalbar-XPVista7@2x.png create mode 100644 browser/themes/windows/sync-horizontalbar-win7.png create mode 100644 browser/themes/windows/sync-horizontalbar-win7@2x.png delete mode 100644 browser/themes/windows/syncProgress-horizontalbar-XPVista7.png delete mode 100644 browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png create mode 100644 browser/themes/windows/syncProgress-horizontalbar-win7.png create mode 100644 browser/themes/windows/syncProgress-horizontalbar-win7@2x.png delete mode 100644 browser/themes/windows/syncProgress-toolbar-XPVista7.png delete mode 100644 browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png create mode 100644 browser/themes/windows/syncProgress-toolbar-win7.png create mode 100644 browser/themes/windows/syncProgress-toolbar-win7@2x.png delete mode 100644 browser/themes/windows/tabbrowser/newtab-XPVista7.svg delete mode 100644 browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg create mode 100644 browser/themes/windows/tabbrowser/newtab-inverted-win7.svg create mode 100644 browser/themes/windows/tabbrowser/newtab-win7.svg delete mode 100644 browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg create mode 100644 browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg delete mode 100644 browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png create mode 100644 browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png delete mode 100644 browser/themes/windows/urlbar-history-dropmarker-XPVista7.png delete mode 100644 browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png create mode 100644 browser/themes/windows/urlbar-history-dropmarker-win7.png create mode 100644 browser/themes/windows/urlbar-history-dropmarker-win7@2x.png delete mode 100644 toolkit/themes/windows/global/dirListing/folder-XP.png delete mode 100644 toolkit/themes/windows/global/dirListing/local-XP.png delete mode 100644 toolkit/themes/windows/global/dirListing/remote-XP.png delete mode 100644 toolkit/themes/windows/global/dirListing/up-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Landscape-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Portrait-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Print-preview-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Question-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Search-close-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Search-glass-XP.png delete mode 100644 toolkit/themes/windows/global/icons/Warning-XP.png delete mode 100644 toolkit/themes/windows/global/icons/autoscroll-XP.png delete mode 100644 toolkit/themes/windows/global/icons/blacklist_favicon-XP.png delete mode 100644 toolkit/themes/windows/global/icons/blacklist_large-XP.png delete mode 100644 toolkit/themes/windows/global/icons/close-XPVista7.png delete mode 100644 toolkit/themes/windows/global/icons/close-XPVista7@2x.png delete mode 100644 toolkit/themes/windows/global/icons/close-inverted-XPVista7.png delete mode 100644 toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png create mode 100644 toolkit/themes/windows/global/icons/close-inverted-win7.png create mode 100644 toolkit/themes/windows/global/icons/close-inverted-win7@2x.png create mode 100644 toolkit/themes/windows/global/icons/close-win7.png create mode 100644 toolkit/themes/windows/global/icons/close-win7@2x.png delete mode 100644 toolkit/themes/windows/global/icons/error-16-XP.png delete mode 100644 toolkit/themes/windows/global/icons/error-64-XP.png delete mode 100644 toolkit/themes/windows/global/icons/folder-item-XP.png delete mode 100644 toolkit/themes/windows/global/icons/information-16-XP.png delete mode 100644 toolkit/themes/windows/global/icons/information-24-XP.png delete mode 100644 toolkit/themes/windows/global/icons/information-32-XP.png delete mode 100644 toolkit/themes/windows/global/icons/question-16-XP.png delete mode 100644 toolkit/themes/windows/global/icons/question-64-XP.png delete mode 100644 toolkit/themes/windows/global/icons/sslWarning-XP.png delete mode 100644 toolkit/themes/windows/global/icons/warning-16-XP.png delete mode 100644 toolkit/themes/windows/global/icons/warning-64-XP.png delete mode 100644 toolkit/themes/windows/global/icons/warning-large-XP.png delete mode 100644 toolkit/themes/windows/global/icons/windowControls-XP.png delete mode 100644 toolkit/themes/windows/global/toolbar/spring-XP.png delete mode 100644 toolkit/themes/windows/global/tree/sort-asc-XP.png delete mode 100644 toolkit/themes/windows/global/tree/sort-dsc-XP.png delete mode 100644 toolkit/themes/windows/global/tree/twisty-Vista78.svg delete mode 100644 toolkit/themes/windows/global/tree/twisty-XP.svg create mode 100644 toolkit/themes/windows/global/tree/twisty-preWin10.svg delete mode 100644 toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png delete mode 100644 toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png delete mode 100644 toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png delete mode 100644 toolkit/themes/windows/mozapps/profile/profileicon-XP.png delete mode 100644 toolkit/themes/windows/mozapps/update/downloadButtons-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/category-available-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png delete mode 100644 toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 366842598..7baa6ebed 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -171,7 +171,7 @@ chrome/toolkit/skin/classic/global/dialog.css chrome/toolkit/skin/classic/global/dropmarker.css chrome/toolkit/skin/classic/global/global.css chrome/toolkit/skin/classic/global/groupbox.css -chrome/toolkit/skin/classic/global/icons/close-XPVista7.png +chrome/toolkit/skin/classic/global/icons/close-win7.png chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png chrome/toolkit/skin/classic/global/listbox.css chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png @@ -196,7 +196,6 @@ chrome/toolkit/skin/classic/global/toolbarbutton.css chrome/toolkit/skin/classic/global/tree.css chrome/toolkit/skin/classic/global/wizard.css chrome/toolkit/skin/classic/mozapps/downloads/buttons.png -chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png @@ -209,7 +208,6 @@ chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png chrome/toolkit/skin/classic/mozapps/update/buttons.png -chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png diff --git a/browser/themes/windows/Info-XP.png b/browser/themes/windows/Info-XP.png deleted file mode 100644 index c20f66ce6..000000000 Binary files a/browser/themes/windows/Info-XP.png and /dev/null differ diff --git a/browser/themes/windows/Privacy-16-XP.png b/browser/themes/windows/Privacy-16-XP.png deleted file mode 100644 index 335febbb3..000000000 Binary files a/browser/themes/windows/Privacy-16-XP.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-XP.png b/browser/themes/windows/Toolbar-XP.png deleted file mode 100644 index dff60911f..000000000 Binary files a/browser/themes/windows/Toolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-aero.png b/browser/themes/windows/Toolbar-aero.png deleted file mode 100644 index b191ce2aa..000000000 Binary files a/browser/themes/windows/Toolbar-aero.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-aero@2x.png b/browser/themes/windows/Toolbar-aero@2x.png deleted file mode 100644 index 033d87dff..000000000 Binary files a/browser/themes/windows/Toolbar-aero@2x.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-lunaSilver.png b/browser/themes/windows/Toolbar-lunaSilver.png deleted file mode 100644 index 30c425c26..000000000 Binary files a/browser/themes/windows/Toolbar-lunaSilver.png and /dev/null differ diff --git a/browser/themes/windows/Toolbar-win7.png b/browser/themes/windows/Toolbar-win7.png new file mode 100644 index 000000000..b191ce2aa Binary files /dev/null and b/browser/themes/windows/Toolbar-win7.png differ diff --git a/browser/themes/windows/Toolbar-win7@2x.png b/browser/themes/windows/Toolbar-win7@2x.png new file mode 100644 index 000000000..033d87dff Binary files /dev/null and b/browser/themes/windows/Toolbar-win7@2x.png differ diff --git a/browser/themes/windows/actionicon-tab-XPVista7.png b/browser/themes/windows/actionicon-tab-XPVista7.png deleted file mode 100644 index 8437c7655..000000000 Binary files a/browser/themes/windows/actionicon-tab-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/actionicon-tab-win7.png b/browser/themes/windows/actionicon-tab-win7.png new file mode 100644 index 000000000..8437c7655 Binary files /dev/null and b/browser/themes/windows/actionicon-tab-win7.png differ diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css index 28599af7a..dbac6bb7a 100644 --- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -445,7 +445,7 @@ } /* The borders on the glass frame are ours, and inside #browser, and on - * vista and win7 we want to make sure they are "glassy", so we can't use + * win7 we want to make sure they are "glassy", so we can't use * #browser as the exclude-glass container. We use #appcontent instead. */ #browser { -moz-appearance: none; @@ -458,7 +458,7 @@ @media (-moz-os-version: windows-win8) { /* Artificially draw window borders that are covered by lwtheme, see bug 591930. - * Borders for vista/win7 are below, win10 doesn't need them. */ + * Borders for win7 are below, win10 doesn't need them. */ #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { border-top: 1px solid @toolbarShadowColor@; } @@ -473,11 +473,9 @@ * On aero, the menubar fog disappears for inactive windows, and renders gray * illegible. */ - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive { - color: ThreeDShadow; - } + @media not all and (-moz-os-version: windows-win7) { + #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive { + color: ThreeDShadow; } } } @@ -487,9 +485,8 @@ color: white; } - /* Show borders on vista through win8, but not on win10 and later: */ - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + /* Show borders on win7 and win8, but not on win10 and later: */ + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { /* Vertical toolbar border */ #main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme), diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 15e776da1..a0cdabfb2 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -131,8 +131,7 @@ toolbar:-moz-lwtheme { } @media (-moz-windows-default-theme) { - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { #navigator-toolbox::after { border-bottom-color: #aabccf; } @@ -160,9 +159,7 @@ toolbar:-moz-lwtheme { background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@); } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #nav-bar { background-image: linear-gradient(@toolbarHighlight@, transparent) !important; } @@ -318,64 +315,6 @@ toolbar:-moz-lwtheme { } } -/* Render a window top border for lwthemes on WinXP modern themes: */ -@media (-moz-windows-theme: luna-blue) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(8, 49, 216) 0, rgb(8, 49, 216) 1px, - rgb(15, 77, 227) 1px, rgb(15, 77, 227) 2px, - rgb(22, 106, 238) 2px, rgb(22, 106, 238) 3px, - rgb(8, 85, 221) 3px, rgb(8, 85, 221) 4px, - transparent 4px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(91, 104, 205) 0, rgb(91, 104, 205) 1px, - rgb(116, 128, 220) 1px, rgb(116, 128, 220) 2px, - rgb(117, 140, 221) 2px, rgb(117, 140, 221) 4px, - transparent 4px); - } -} - -@media (-moz-windows-theme: luna-silver) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(102,102,126) 0, rgb(102,102,126) 1px, - rgb(168,167,191) 1px, rgb(168,167,191) 2px, - white 2px, white 3px, - rgb(188,188,207) 3px, rgb(188,188,207) 4px, - transparent 4px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(186,186,197) 0, rgb(186,186,197) 1px, - rgb(236,238,245) 1px, rgb(236,238,245) 2px, - white 2px, white 3px, - rgb(215,215,227) 3px, rgb(215,215,227) 4px, - transparent 4px); - } -} - -@media (-moz-windows-theme: luna-olive) { - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { - background-image: linear-gradient(to bottom, - rgb(139,161,105) 0, rgb(139,161,105) 1px, - rgb(171, 189, 133) 1px, rgb(171, 189, 133) 2px, - rgb(164,178,127) 2px, rgb(164,178,127) 3px, - transparent 3px); - } - - #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { - background-image: linear-gradient(to bottom, - rgb(207, 214, 188) 0, rgb(207, 214, 188) 1px, - rgb(224, 226, 200) 1px, rgb(224, 226, 200) 2px, - rgb(214, 216, 190) 2px, rgb(214, 216, 190) 3px, - transparent 3px); - } -} - #TabsToolbar:not([collapsed="true"]) + #nav-bar { /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap)); @@ -406,12 +345,6 @@ toolbar:-moz-lwtheme { background-color: -moz-dialog; } -@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) { - #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar { - margin-top: 4px; - } -} - /* ::::: titlebar ::::: */ #main-window[sizemode="normal"] > #titlebar { @@ -432,7 +365,7 @@ toolbar:-moz-lwtheme { * click and hover mouse events to work properly for the button in the restored * window state. Otherwise, elements in the navigator-toolbox, like the menubar, * can swallow those events. It will also place the buttons above the fog on - * themes with Aero Glass. + * Windows 7 with Aero Glass. */ #titlebar-buttonbox { z-index: 1; @@ -442,12 +375,6 @@ toolbar:-moz-lwtheme { margin-left: 22px; /* space needed for Aero Snap */ } -@media (-moz-os-version: windows-xp) { - .titlebar-placeholder[type="caption-buttons"] { - margin-left: 10px; /* less space needed on XP because there's no Aero Snap */ - } -} - /* titlebar command buttons */ #titlebar-min { @@ -670,13 +597,6 @@ menuitem.bookmark-item { %include ../shared/toolbarbuttons.inc.css -@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) { - :-moz-any(@primaryToolbarButtons@), - #bookmarks-menu-button.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png"); - } -} - #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, @@ -780,10 +700,7 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { max-width: 32px; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - /* < Win8 */ +@media (-moz-os-version: windows-win7) { :root { --toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); --toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25); @@ -1101,9 +1018,7 @@ toolbar[brighttext] #close-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #window-controls { margin-inline-start: 4px; } @@ -1159,8 +1074,7 @@ toolbar[brighttext] #close-button { } } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #window-controls { -moz-box-align: start; } @@ -1204,8 +1118,7 @@ toolbar[brighttext] #close-button { } @media (-moz-windows-default-theme) { - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #main-window:not(:-moz-lwtheme) { --urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3); @@ -1242,8 +1155,7 @@ toolbar[brighttext] #close-button { border-radius: 1px; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #urlbar:not(:-moz-lwtheme), .searchbar-textbox:not(:-moz-lwtheme) { @@ -1266,11 +1178,9 @@ toolbar[brighttext] #close-button { } } - @media not all and (-moz-os-version: windows-xp) { - #urlbar:not(:-moz-lwtheme)[focused], - .searchbar-textbox:not(:-moz-lwtheme)[focused] { - border-color: Highlight; - } + #urlbar:not(:-moz-lwtheme)[focused], + .searchbar-textbox:not(:-moz-lwtheme)[focused] { + border-color: Highlight; } } @@ -2023,9 +1933,7 @@ html|span.ac-emphasize-text-url { } } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { #sidebar-header > .close-icon { padding-top: 4px; padding-bottom: 4px; @@ -2046,39 +1954,28 @@ html|span.ac-emphasize-text-url { margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */ } -@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) { - #main-window[sizemode=normal] #TabsToolbar { - padding-left: 2px; - padding-right: 2px; - } -} - %include ../shared/tabs.inc.css /* Remove border between tab strip and navigation toolbar on Windows 10+ */ -@media not all and (-moz-os-version: windows-xp) { - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - @media not all and (-moz-os-version: windows-win8) { - @media (-moz-windows-default-theme) { - .tab-background-end[selected=true]::after, - .tab-background-start[selected=true]::after { - content: none; - } - - #TabsToolbar { - --tab-stroke-background-size: 0 0; - } - - :root { - --tab-toolbar-navbar-overlap: 0px; - } - - #nav-bar { - border-top-style: none !important; - box-shadow: none; - } - } +@media not all and (-moz-os-version: windows-win7) { + @media not all and (-moz-os-version: windows-win8) { + @media (-moz-windows-default-theme) { + .tab-background-end[selected=true]::after, + .tab-background-start[selected=true]::after { + content: none; + } + + #TabsToolbar { + --tab-stroke-background-size: 0 0; + } + + :root { + --tab-toolbar-navbar-overlap: 0px; + } + + #nav-bar { + border-top-style: none !important; + box-shadow: none; } } } @@ -2563,22 +2460,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { position: relative; } -@media (-moz-os-version: windows-xp) { - @media not all and (-moz-windows-classic) { - #private-browsing-indicator-titlebar > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png"); - height: 28px; - } - - #main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: -5px; - } - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: -1px; - } - } -} - @media (-moz-windows-classic) { /** * We have to use top instead of background-position in this case, otherwise @@ -2590,8 +2471,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { } } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { @media (-moz-windows-glass) { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { top: 1px; @@ -2608,7 +2488,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { @media (-moz-windows-default-theme) { @media not all and (-moz-windows-compositor) { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png"); + background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png"); height: 28px; } } @@ -2641,19 +2521,14 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton { margin-top: -4px; } - -@media not all and (-moz-os-version: windows-xp) { %include browser-aero.css -} .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent { padding: 0; overflow: hidden; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { .cui-widget-panelview[id^=PanelUI-webext-] { border-radius: 4px; } diff --git a/browser/themes/windows/customizableui/panelUI.css b/browser/themes/windows/customizableui/panelUI.css index 92080d599..189a163f3 100644 --- a/browser/themes/windows/customizableui/panelUI.css +++ b/browser/themes/windows/customizableui/panelUI.css @@ -131,21 +131,17 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { } /* Win8 and beyond. */ -@media not all and (-moz-os-version: windows-xp) { - @media not all and (-moz-os-version: windows-vista) { - @media not all and (-moz-os-version: windows-win7) { - panelview .toolbarbutton-1, - .subviewbutton, - .widget-overflow-list .toolbarbutton-1, - .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, - #BMB_bookmarksPopup menupopup[placespopup=true] > hbox, - #edit-controls@inAnyPanel@, - #zoom-controls@inAnyPanel@, - #edit-controls@inAnyPanel@ > toolbarbutton, - #zoom-controls@inAnyPanel@ > toolbarbutton { - border-radius: 0; - } - } +@media not all and (-moz-os-version: windows-win7) { + panelview .toolbarbutton-1, + .subviewbutton, + .widget-overflow-list .toolbarbutton-1, + .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button, + #BMB_bookmarksPopup menupopup[placespopup=true] > hbox, + #edit-controls@inAnyPanel@, + #zoom-controls@inAnyPanel@, + #edit-controls@inAnyPanel@ > toolbarbutton, + #zoom-controls@inAnyPanel@ > toolbarbutton { + border-radius: 0; } } diff --git a/browser/themes/windows/devedition.css b/browser/themes/windows/devedition.css index 2dc72eeeb..bdf4bb80e 100644 --- a/browser/themes/windows/devedition.css +++ b/browser/themes/windows/devedition.css @@ -16,7 +16,7 @@ /* The window background is white due to no accentcolor in the lightweight theme. It can't be changed to transparent when there is no compositor - (Win XP or 7 in classic / basic theme), or else dragging and focus become + (Win 7 in classic / basic theme), or else dragging and focus become broken. So instead just show the normal titlebar in that case, and override the window color as transparent when the compositor is available. */ @media not all and (-moz-windows-compositor) { @@ -116,9 +116,7 @@ } } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { :root { --space-above-tabbar: 15px; @@ -261,8 +259,7 @@ color: var(--chrome-color); } -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), +@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { /* And then we add them back on toolbars so that they don't look borderless: */ #main-window:not([customizing])[sizemode=normal] #navigator-toolbox::after, diff --git a/browser/themes/windows/downloads/allDownloadsViewOverlay.css b/browser/themes/windows/downloads/allDownloadsViewOverlay.css index e288f1e90..0ee83f669 100644 --- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css +++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css @@ -18,32 +18,30 @@ /*** Highlighted list items ***/ -@media not all and (-moz-os-version: windows-xp) { - @media (-moz-windows-default-theme) { - /* - -moz-appearance: menuitem is almost right, but the hover effect is not - transparent and is lighter than desired. - - Copied from the autocomplete richlistbox styling in - toolkit/themes/windows/global/autocomplete.css - - This styling should be kept in sync with the style from the above file. - */ - @itemFocused@ { - color: inherit; - background-color: transparent; - /* four gradients for the bevel highlights on each edge, one for blue background */ - background-image: - linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), - linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), - linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); - background-clip: content-box; - border-radius: 6px; - outline: 1px solid rgb(124,163,206); - -moz-outline-radius: 3px; - outline-offset: -2px; - } +@media (-moz-windows-default-theme) { + /* + -moz-appearance: menuitem is almost right, but the hover effect is not + transparent and is lighter than desired. + + Copied from the autocomplete richlistbox styling in + toolkit/themes/windows/global/autocomplete.css + + This styling should be kept in sync with the style from the above file. + */ + @itemFocused@ { + color: inherit; + background-color: transparent; + /* four gradients for the bevel highlights on each edge, one for blue background */ + background-image: + linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), + linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), + linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), + linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), + linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); + background-clip: content-box; + border-radius: 6px; + outline: 1px solid rgb(124,163,206); + -moz-outline-radius: 3px; + outline-offset: -2px; } } diff --git a/browser/themes/windows/downloads/download-glow-XPVista7.png b/browser/themes/windows/downloads/download-glow-XPVista7.png deleted file mode 100644 index e7415e83d..000000000 Binary files a/browser/themes/windows/downloads/download-glow-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png b/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png deleted file mode 100644 index 7ff7e6a03..000000000 Binary files a/browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/downloads/download-glow-menuPanel-win7.png b/browser/themes/windows/downloads/download-glow-menuPanel-win7.png new file mode 100644 index 000000000..7ff7e6a03 Binary files /dev/null and b/browser/themes/windows/downloads/download-glow-menuPanel-win7.png differ diff --git a/browser/themes/windows/downloads/download-glow-win7.png b/browser/themes/windows/downloads/download-glow-win7.png new file mode 100644 index 000000000..e7415e83d Binary files /dev/null and b/browser/themes/windows/downloads/download-glow-win7.png differ diff --git a/browser/themes/windows/downloads/indicator.css b/browser/themes/windows/downloads/indicator.css index 627265088..7f921f8de 100644 --- a/browser/themes/windows/downloads/indicator.css +++ b/browser/themes/windows/downloads/indicator.css @@ -166,13 +166,9 @@ toolbar[brighttext] #downloads-button:not([counter])[attention="success"] > #dow font-size: 9px; line-height: 9px; text-align: center; -} -@media not all and (-moz-os-version: windows-xp) { - #downloads-indicator-counter { - /* Bug 812345 added this... */ - margin-bottom: -1px; - } + /* Bug 812345 added this... */ + margin-bottom: -1px; } toolbar[brighttext] #downloads-indicator-counter { diff --git a/browser/themes/windows/feeds/feedIcon-XP.png b/browser/themes/windows/feeds/feedIcon-XP.png deleted file mode 100644 index d0cafb1d4..000000000 Binary files a/browser/themes/windows/feeds/feedIcon-XP.png and /dev/null differ diff --git a/browser/themes/windows/feeds/feedIcon16-XP.png b/browser/themes/windows/feeds/feedIcon16-XP.png deleted file mode 100644 index dd7821f8d..000000000 Binary files a/browser/themes/windows/feeds/feedIcon16-XP.png and /dev/null differ diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 89c589aba..10abfd001 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -11,21 +11,17 @@ browser.jar: * skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css) skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png - skin/classic/browser/actionicon-tab-XPVista7.png + skin/classic/browser/actionicon-tab-win7.png * skin/classic/browser/browser.css * skin/classic/browser/devedition.css * skin/classic/browser/browser-lightweightTheme.css skin/classic/browser/caption-buttons.svg skin/classic/browser/click-to-play-warning-stripes.png skin/classic/browser/Info.png - skin/classic/browser/Info-XP.png skin/classic/browser/keyhole-forward-mask.svg skin/classic/browser/livemark-folder.png - skin/classic/browser/livemark-folder-XP.png skin/classic/browser/menu-back.png - skin/classic/browser/menu-back-XP.png skin/classic/browser/menu-forward.png - skin/classic/browser/menu-forward-XP.png skin/classic/browser/menuPanel-customize.png skin/classic/browser/menuPanel-customize@2x.png skin/classic/browser/menuPanel-exit.png @@ -36,36 +32,33 @@ browser.jar: skin/classic/browser/monitor_16-10.png skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png - skin/classic/browser/pageInfo-XP.png skin/classic/browser/privatebrowsing-mask-tabstrip.png - skin/classic/browser/privatebrowsing-mask-tabstrip-XPVista7.png + skin/classic/browser/privatebrowsing-mask-tabstrip-win7.png skin/classic/browser/privatebrowsing-mask-titlebar.png - skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7.png - skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7-tall.png + skin/classic/browser/privatebrowsing-mask-titlebar-win7.png + skin/classic/browser/privatebrowsing-mask-titlebar-win7-tall.png skin/classic/browser/reload-stop-go.png skin/classic/browser/reload-stop-go@2x.png - skin/classic/browser/reload-stop-go-XPVista7.png - skin/classic/browser/reload-stop-go-XPVista7@2x.png + skin/classic/browser/reload-stop-go-win7.png + skin/classic/browser/reload-stop-go-win7@2x.png skin/classic/browser/searchbar.css skin/classic/browser/setDesktopBackground.css skin/classic/browser/slowStartup-16.png skin/classic/browser/Toolbar.png skin/classic/browser/Toolbar@2x.png - skin/classic/browser/Toolbar-aero.png - skin/classic/browser/Toolbar-aero@2x.png + skin/classic/browser/Toolbar-win7.png + skin/classic/browser/Toolbar-win7@2x.png skin/classic/browser/Toolbar-inverted.png skin/classic/browser/Toolbar-inverted@2x.png - skin/classic/browser/Toolbar-lunaSilver.png skin/classic/browser/Toolbar-win8.png skin/classic/browser/Toolbar-win8@2x.png - skin/classic/browser/Toolbar-XP.png - skin/classic/browser/toolbarbutton-dropdown-arrow-XPVista7.png + skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png skin/classic/browser/urlbar-history-dropmarker@2x.png - skin/classic/browser/urlbar-history-dropmarker-XPVista7.png - skin/classic/browser/urlbar-history-dropmarker-XPVista7@2x.png + skin/classic/browser/urlbar-history-dropmarker-win7.png + skin/classic/browser/urlbar-history-dropmarker-win7@2x.png skin/classic/browser/webRTC-indicator.css * skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css) skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png) @@ -78,57 +71,40 @@ browser.jar: * skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css) * skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css) skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png) - skin/classic/browser/downloads/download-glow-menuPanel-XPVista7.png (downloads/download-glow-menuPanel-XPVista7.png) + skin/classic/browser/downloads/download-glow-menuPanel-win7.png (downloads/download-glow-menuPanel-win7.png) skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png) skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png) * skin/classic/browser/downloads/downloads.css (downloads/downloads.css) skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png) skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png) - skin/classic/browser/feeds/feedIcon-XP.png (feeds/feedIcon-XP.png) - skin/classic/browser/feeds/feedIcon16-XP.png (feeds/feedIcon16-XP.png) skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css) skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css) * skin/classic/browser/newtab/newTab.css (newtab/newTab.css) skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png) skin/classic/browser/places/autocomplete-star@2x.png (places/autocomplete-star@2x.png) - skin/classic/browser/places/autocomplete-star-XPVista7.png (places/autocomplete-star-XPVista7.png) + skin/classic/browser/places/autocomplete-star-win7.png (places/autocomplete-star-win7.png) skin/classic/browser/places/places.css (places/places.css) * skin/classic/browser/places/organizer.css (places/organizer.css) skin/classic/browser/places/query.png (places/query.png) - skin/classic/browser/places/query-XP.png (places/query-XP.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) - skin/classic/browser/places/bookmarksMenu-XP.png (places/bookmarksMenu-XP.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) - skin/classic/browser/places/bookmarksToolbar-XP.png (places/bookmarksToolbar-XP.png) skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png) - skin/classic/browser/places/bookmarksToolbar-menuPanel-XP.png (places/bookmarksToolbar-menuPanel-XP.png) skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png) skin/classic/browser/places/calendar.png (places/calendar.png) - skin/classic/browser/places/calendar-XP.png (places/calendar-XP.png) skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) - skin/classic/browser/places/toolbarDropMarker-XP.png (places/toolbarDropMarker-XP.png) skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) - skin/classic/browser/places/libraryToolbar-XP.png (places/libraryToolbar-XP.png) skin/classic/browser/places/starred48.png (places/starred48.png) - skin/classic/browser/places/starred48-XP.png (places/starred48-XP.png) skin/classic/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/browser/places/tag.png (places/tag.png) - skin/classic/browser/places/tag-XP.png (places/tag-XP.png) skin/classic/browser/places/history.png (places/history.png) - skin/classic/browser/places/history-XP.png (places/history-XP.png) skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png) - skin/classic/browser/places/allBookmarks-XP.png (places/allBookmarks-XP.png) skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png) - skin/classic/browser/places/unsortedBookmarks-XP.png (places/unsortedBookmarks-XP.png) skin/classic/browser/places/downloads.png (places/downloads.png) skin/classic/browser/places/livemark-item.png (places/livemark-item.png) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) - skin/classic/browser/preferences/alwaysAsk-XP.png (preferences/alwaysAsk-XP.png) skin/classic/browser/preferences/application.png (preferences/application.png) - skin/classic/browser/preferences/application-XP.png (preferences/application-XP.png) skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) - skin/classic/browser/preferences/saveFile-XP.png (preferences/saveFile-XP.png) skin/classic/browser/preferences/preferences.css (preferences/preferences.css) * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) @@ -136,13 +112,13 @@ browser.jar: skin/classic/browser/social/services-16.png (social/services-16.png) skin/classic/browser/social/services-64.png (social/services-64.png) skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg) - skin/classic/browser/tabbrowser/newtab-XPVista7.svg (tabbrowser/newtab-XPVista7.svg) + skin/classic/browser/tabbrowser/newtab-win7.svg (tabbrowser/newtab-win7.svg) skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg) - skin/classic/browser/tabbrowser/newtab-inverted-XPVista7.svg (tabbrowser/newtab-inverted-XPVista7.svg) + skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg) skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png) skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png) skin/classic/browser/tabbrowser/tab-arrow-left.svg (tabbrowser/tab-arrow-left.svg) - skin/classic/browser/tabbrowser/tab-arrow-left-XPVista7.svg (tabbrowser/tab-arrow-left-XPVista7.svg) + skin/classic/browser/tabbrowser/tab-arrow-left-win7.svg (tabbrowser/tab-arrow-left-win7.svg) skin/classic/browser/tabbrowser/tab-arrow-left-inverted.svg (tabbrowser/tab-arrow-left-inverted.svg) skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png) skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png) @@ -174,8 +150,8 @@ browser.jar: skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg) skin/classic/browser/sync-horizontalbar.png skin/classic/browser/sync-horizontalbar@2x.png - skin/classic/browser/sync-horizontalbar-XPVista7.png - skin/classic/browser/sync-horizontalbar-XPVista7@2x.png + skin/classic/browser/sync-horizontalbar-win7.png + skin/classic/browser/sync-horizontalbar-win7@2x.png skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg) skin/classic/browser/sync-notification-24.png skin/classic/browser/syncSetup.css @@ -183,16 +159,16 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress-horizontalbar.png skin/classic/browser/syncProgress-horizontalbar@2x.png - skin/classic/browser/syncProgress-horizontalbar-XPVista7.png - skin/classic/browser/syncProgress-horizontalbar-XPVista7@2x.png + skin/classic/browser/syncProgress-horizontalbar-win7.png + skin/classic/browser/syncProgress-horizontalbar-win7@2x.png skin/classic/browser/syncProgress-menuPanel.png skin/classic/browser/syncProgress-menuPanel@2x.png skin/classic/browser/syncProgress-toolbar.png skin/classic/browser/syncProgress-toolbar@2x.png skin/classic/browser/syncProgress-toolbar-inverted.png skin/classic/browser/syncProgress-toolbar-inverted@2x.png - skin/classic/browser/syncProgress-toolbar-XPVista7.png - skin/classic/browser/syncProgress-toolbar-XPVista7@2x.png + skin/classic/browser/syncProgress-toolbar-win7.png + skin/classic/browser/syncProgress-toolbar-win7@2x.png #ifdef E10S_TESTING_ONLY skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png) #endif @@ -205,58 +181,31 @@ browser.jar: % override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png % override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os!=WINNT -% override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os=WINNT osversion<6 -% override chrome://browser/skin/Info.png chrome://browser/skin/Info-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/livemark-folder.png chrome://browser/skin/livemark-folder-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/menu-back.png chrome://browser/skin/menu-back-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/menu-forward.png chrome://browser/skin/menu-forward-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/pageInfo.png chrome://browser/skin/pageInfo-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/feeds/feedIcon.png chrome://browser/skin/feeds/feedIcon-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/feeds/feedIcon16.png chrome://browser/skin/feeds/feedIcon16-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/query.png chrome://browser/skin/places/query-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksMenu.png chrome://browser/skin/places/bookmarksMenu-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksToolbar.png chrome://browser/skin/places/bookmarksToolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/bookmarksToolbar-menuPanel.png chrome://browser/skin/places/bookmarksToolbar-menuPanel-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/calendar.png chrome://browser/skin/places/calendar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/toolbarDropMarker.png chrome://browser/skin/places/toolbarDropMarker-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/libraryToolbar.png chrome://browser/skin/places/libraryToolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/starred48.png chrome://browser/skin/places/starred48-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/tag.png chrome://browser/skin/places/tag-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/history.png chrome://browser/skin/places/history-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/allBookmarks.png chrome://browser/skin/places/allBookmarks-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/places/unsortedBookmarks.png chrome://browser/skin/places/unsortedBookmarks-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/alwaysAsk.png chrome://browser/skin/preferences/alwaysAsk-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/application.png chrome://browser/skin/preferences/application-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/preferences/saveFile.png chrome://browser/skin/preferences/saveFile-XP.png os=WINNT osversion<6 +% override chrome://browser/skin/actionicon-tab.png chrome://browser/skin/actionicon-tab-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-toolbar.png chrome://browser/skin/syncProgress-toolbar-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/syncProgress-toolbar@2x.png chrome://browser/skin/syncProgress-toolbar-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/places/autocomplete-star.png chrome://browser/skin/places/autocomplete-star-win7.png os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-win7.svg os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-win7.svg os=WINNT osversion<=6.1 +% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-win7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/actionicon-tab.png chrome://browser/skin/actionicon-tab-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-toolbar.png chrome://browser/skin/syncProgress-toolbar-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/syncProgress-toolbar@2x.png chrome://browser/skin/syncProgress-toolbar-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7@2x.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/places/autocomplete-star.png chrome://browser/skin/places/autocomplete-star-XPVista7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-XPVista7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-XPVista7.svg os=WINNT osversion<=6.1 -% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-XPVista7.svg os=WINNT osversion<=6.1 - -% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6 -% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6.1 +% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win7@2x.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.3 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6 -% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6.1 +% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win7.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.3 diff --git a/browser/themes/windows/livemark-folder-XP.png b/browser/themes/windows/livemark-folder-XP.png deleted file mode 100644 index 00aa0364d..000000000 Binary files a/browser/themes/windows/livemark-folder-XP.png and /dev/null differ diff --git a/browser/themes/windows/menu-back-XP.png b/browser/themes/windows/menu-back-XP.png deleted file mode 100644 index ecb8ccd1a..000000000 Binary files a/browser/themes/windows/menu-back-XP.png and /dev/null differ diff --git a/browser/themes/windows/menu-forward-XP.png b/browser/themes/windows/menu-forward-XP.png deleted file mode 100644 index a7460dc27..000000000 Binary files a/browser/themes/windows/menu-forward-XP.png and /dev/null differ diff --git a/browser/themes/windows/pageInfo-XP.png b/browser/themes/windows/pageInfo-XP.png deleted file mode 100644 index bbf257237..000000000 Binary files a/browser/themes/windows/pageInfo-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/allBookmarks-XP.png b/browser/themes/windows/places/allBookmarks-XP.png deleted file mode 100644 index f7903cc5f..000000000 Binary files a/browser/themes/windows/places/allBookmarks-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/autocomplete-star-XPVista7.png b/browser/themes/windows/places/autocomplete-star-XPVista7.png deleted file mode 100644 index af694e91c..000000000 Binary files a/browser/themes/windows/places/autocomplete-star-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/places/autocomplete-star-win7.png b/browser/themes/windows/places/autocomplete-star-win7.png new file mode 100644 index 000000000..af694e91c Binary files /dev/null and b/browser/themes/windows/places/autocomplete-star-win7.png differ diff --git a/browser/themes/windows/places/bookmarksMenu-XP.png b/browser/themes/windows/places/bookmarksMenu-XP.png deleted file mode 100644 index 8f0c8bf58..000000000 Binary files a/browser/themes/windows/places/bookmarksMenu-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/bookmarksToolbar-XP.png b/browser/themes/windows/places/bookmarksToolbar-XP.png deleted file mode 100644 index 9e988de20..000000000 Binary files a/browser/themes/windows/places/bookmarksToolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png b/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png deleted file mode 100644 index 0e4247adb..000000000 Binary files a/browser/themes/windows/places/bookmarksToolbar-menuPanel-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/calendar-XP.png b/browser/themes/windows/places/calendar-XP.png deleted file mode 100644 index 7645af5cd..000000000 Binary files a/browser/themes/windows/places/calendar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/history-XP.png b/browser/themes/windows/places/history-XP.png deleted file mode 100644 index fcc89bbbf..000000000 Binary files a/browser/themes/windows/places/history-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/libraryToolbar-XP.png b/browser/themes/windows/places/libraryToolbar-XP.png deleted file mode 100644 index 75b390ff6..000000000 Binary files a/browser/themes/windows/places/libraryToolbar-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/organizer.css b/browser/themes/windows/places/organizer.css index 4de603b9f..9ae4c8370 100644 --- a/browser/themes/windows/places/organizer.css +++ b/browser/themes/windows/places/organizer.css @@ -20,13 +20,6 @@ list-style-image: url("chrome://browser/skin/Toolbar.png"); } -@media (-moz-windows-theme: luna-silver) { - #back-button, - #forward-button { - list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png"); - } -} - #back-button { -moz-image-region: rect(0, 54px, 18px, 36px); } @@ -119,11 +112,6 @@ -moz-image-region: rect(16px, 48px, 32px, 32px); } -/* Root View */ -#placesView { - border-top: 1px solid ThreeDDarkShadow; -} - /* Info box */ #detailsDeck { border-top: 1px solid ThreeDShadow; @@ -151,35 +139,28 @@ padding-inline-end: 9px; } - -@media not all and (-moz-os-version: windows-xp) { - #placesView { - border-top: none; +@media not all and (-moz-windows-classic) { + #placesToolbox { + -moz-appearance: none; + background-color: transparent; } - @media not all and (-moz-windows-classic) { - #placesToolbox { - -moz-appearance: none; - background-color: transparent; - } - - #placesToolbar { - -moz-appearance: none; - background-color: -moz-Dialog; - color: -moz-dialogText; - } + #placesToolbar { + -moz-appearance: none; + background-color: -moz-Dialog; + color: -moz-dialogText; } +} - @media (-moz-windows-default-theme) { - #placesView > splitter { - border: 0; - border-inline-end: 1px solid #A9B7C9; - min-width: 0; - width: 3px; - background-color: transparent; - margin-inline-start: -3px; - position: relative; - } +@media (-moz-windows-default-theme) { + #placesView > splitter { + border: 0; + border-inline-end: 1px solid #A9B7C9; + min-width: 0; + width: 3px; + background-color: transparent; + margin-inline-start: -3px; + position: relative; } } @@ -193,8 +174,7 @@ } } -@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista), - (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { +@media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { #placesView, #infoPane, #placesList, diff --git a/browser/themes/windows/places/places.css b/browser/themes/windows/places/places.css index 4ec8f6555..769cfcc25 100644 --- a/browser/themes/windows/places/places.css +++ b/browser/themes/windows/places/places.css @@ -24,21 +24,17 @@ cursor: default; } -/* Style Places sidebars as Vista media collection */ @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - .sidebar-placesTree { - background-color: transparent; - border-top: none; - } + .sidebar-placesTree { + background-color: transparent; + border-top: none; + } - .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { - text-decoration: none; - } + .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { + text-decoration: none; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { #bookmarksPanel, #history-panel, #tabs-panel { diff --git a/browser/themes/windows/places/query-XP.png b/browser/themes/windows/places/query-XP.png deleted file mode 100644 index 9e79fc791..000000000 Binary files a/browser/themes/windows/places/query-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/starred48-XP.png b/browser/themes/windows/places/starred48-XP.png deleted file mode 100644 index 1cb7bc57d..000000000 Binary files a/browser/themes/windows/places/starred48-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/tag-XP.png b/browser/themes/windows/places/tag-XP.png deleted file mode 100644 index 4b4a13e66..000000000 Binary files a/browser/themes/windows/places/tag-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/toolbarDropMarker-XP.png b/browser/themes/windows/places/toolbarDropMarker-XP.png deleted file mode 100644 index 9173b7a7a..000000000 Binary files a/browser/themes/windows/places/toolbarDropMarker-XP.png and /dev/null differ diff --git a/browser/themes/windows/places/unsortedBookmarks-XP.png b/browser/themes/windows/places/unsortedBookmarks-XP.png deleted file mode 100644 index cf73f9464..000000000 Binary files a/browser/themes/windows/places/unsortedBookmarks-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/alwaysAsk-XP.png b/browser/themes/windows/preferences/alwaysAsk-XP.png deleted file mode 100644 index 8693211ac..000000000 Binary files a/browser/themes/windows/preferences/alwaysAsk-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/application-XP.png b/browser/themes/windows/preferences/application-XP.png deleted file mode 100644 index 7d279ff84..000000000 Binary files a/browser/themes/windows/preferences/application-XP.png and /dev/null differ diff --git a/browser/themes/windows/preferences/saveFile-XP.png b/browser/themes/windows/preferences/saveFile-XP.png deleted file mode 100644 index e115eaa9f..000000000 Binary files a/browser/themes/windows/preferences/saveFile-XP.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png b/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png deleted file mode 100644 index bd5d46a76..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png b/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png new file mode 100644 index 000000000..bd5d46a76 Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png b/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png deleted file mode 100644 index 4a723c54e..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png b/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png deleted file mode 100644 index 835912b53..000000000 Binary files a/browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png b/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png new file mode 100644 index 000000000..4a723c54e Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png differ diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png b/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png new file mode 100644 index 000000000..835912b53 Binary files /dev/null and b/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png differ diff --git a/browser/themes/windows/reload-stop-go-XPVista7.png b/browser/themes/windows/reload-stop-go-XPVista7.png deleted file mode 100644 index 3ef32c3ce..000000000 Binary files a/browser/themes/windows/reload-stop-go-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/reload-stop-go-XPVista7@2x.png b/browser/themes/windows/reload-stop-go-XPVista7@2x.png deleted file mode 100644 index 38b27bf0c..000000000 Binary files a/browser/themes/windows/reload-stop-go-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/reload-stop-go-win7.png b/browser/themes/windows/reload-stop-go-win7.png new file mode 100644 index 000000000..3ef32c3ce Binary files /dev/null and b/browser/themes/windows/reload-stop-go-win7.png differ diff --git a/browser/themes/windows/reload-stop-go-win7@2x.png b/browser/themes/windows/reload-stop-go-win7@2x.png new file mode 100644 index 000000000..38b27bf0c Binary files /dev/null and b/browser/themes/windows/reload-stop-go-win7@2x.png differ diff --git a/browser/themes/windows/sync-horizontalbar-XPVista7.png b/browser/themes/windows/sync-horizontalbar-XPVista7.png deleted file mode 100644 index 2c97ce6db..000000000 Binary files a/browser/themes/windows/sync-horizontalbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png b/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png deleted file mode 100644 index ee117ab73..000000000 Binary files a/browser/themes/windows/sync-horizontalbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/sync-horizontalbar-win7.png b/browser/themes/windows/sync-horizontalbar-win7.png new file mode 100644 index 000000000..2c97ce6db Binary files /dev/null and b/browser/themes/windows/sync-horizontalbar-win7.png differ diff --git a/browser/themes/windows/sync-horizontalbar-win7@2x.png b/browser/themes/windows/sync-horizontalbar-win7@2x.png new file mode 100644 index 000000000..ee117ab73 Binary files /dev/null and b/browser/themes/windows/sync-horizontalbar-win7@2x.png differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png b/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png deleted file mode 100644 index 48cd11055..000000000 Binary files a/browser/themes/windows/syncProgress-horizontalbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png b/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png deleted file mode 100644 index 741dd2ed4..000000000 Binary files a/browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7.png b/browser/themes/windows/syncProgress-horizontalbar-win7.png new file mode 100644 index 000000000..48cd11055 Binary files /dev/null and b/browser/themes/windows/syncProgress-horizontalbar-win7.png differ diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png b/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png new file mode 100644 index 000000000..741dd2ed4 Binary files /dev/null and b/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png differ diff --git a/browser/themes/windows/syncProgress-toolbar-XPVista7.png b/browser/themes/windows/syncProgress-toolbar-XPVista7.png deleted file mode 100644 index 49e224f0d..000000000 Binary files a/browser/themes/windows/syncProgress-toolbar-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png b/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png deleted file mode 100644 index fd2038725..000000000 Binary files a/browser/themes/windows/syncProgress-toolbar-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/syncProgress-toolbar-win7.png b/browser/themes/windows/syncProgress-toolbar-win7.png new file mode 100644 index 000000000..49e224f0d Binary files /dev/null and b/browser/themes/windows/syncProgress-toolbar-win7.png differ diff --git a/browser/themes/windows/syncProgress-toolbar-win7@2x.png b/browser/themes/windows/syncProgress-toolbar-win7@2x.png new file mode 100644 index 000000000..fd2038725 Binary files /dev/null and b/browser/themes/windows/syncProgress-toolbar-win7@2x.png differ diff --git a/browser/themes/windows/tabbrowser/newtab-XPVista7.svg b/browser/themes/windows/tabbrowser/newtab-XPVista7.svg deleted file mode 100644 index 3f431c9db..000000000 --- a/browser/themes/windows/tabbrowser/newtab-XPVista7.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg b/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg deleted file mode 100644 index 10ffbc745..000000000 --- a/browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg b/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg new file mode 100644 index 000000000..10ffbc745 --- /dev/null +++ b/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/browser/themes/windows/tabbrowser/newtab-win7.svg b/browser/themes/windows/tabbrowser/newtab-win7.svg new file mode 100644 index 000000000..3f431c9db --- /dev/null +++ b/browser/themes/windows/tabbrowser/newtab-win7.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg deleted file mode 100644 index 41bb5ab13..000000000 --- a/browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg new file mode 100644 index 000000000..41bb5ab13 --- /dev/null +++ b/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png b/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png deleted file mode 100644 index 5f892f532..000000000 Binary files a/browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png b/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png new file mode 100644 index 000000000..5f892f532 Binary files /dev/null and b/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png b/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png deleted file mode 100644 index b03338822..000000000 Binary files a/browser/themes/windows/urlbar-history-dropmarker-XPVista7.png and /dev/null differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png b/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png deleted file mode 100644 index bff2997f8..000000000 Binary files a/browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png and /dev/null differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7.png b/browser/themes/windows/urlbar-history-dropmarker-win7.png new file mode 100644 index 000000000..b03338822 Binary files /dev/null and b/browser/themes/windows/urlbar-history-dropmarker-win7.png differ diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png b/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png new file mode 100644 index 000000000..bff2997f8 Binary files /dev/null and b/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png differ diff --git a/browser/themes/windows/windowsShared.inc b/browser/themes/windows/windowsShared.inc index 0cb2ab163..199a62292 100644 --- a/browser/themes/windows/windowsShared.inc +++ b/browser/themes/windows/windowsShared.inc @@ -8,6 +8,4 @@ %define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@) %define fgTabBackgroundColor -moz-dialog %define fgTabTextureLWT @fgTabTexture@ - -% Aero-only defines %define customToolbarColor hsl(210,75%,92%) diff --git a/toolkit/themes/windows/global/dirListing/folder-XP.png b/toolkit/themes/windows/global/dirListing/folder-XP.png deleted file mode 100644 index 102de5196..000000000 Binary files a/toolkit/themes/windows/global/dirListing/folder-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/dirListing/local-XP.png b/toolkit/themes/windows/global/dirListing/local-XP.png deleted file mode 100644 index 99191f3a5..000000000 Binary files a/toolkit/themes/windows/global/dirListing/local-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/dirListing/remote-XP.png b/toolkit/themes/windows/global/dirListing/remote-XP.png deleted file mode 100644 index 4febb764b..000000000 Binary files a/toolkit/themes/windows/global/dirListing/remote-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/dirListing/up-XP.png b/toolkit/themes/windows/global/dirListing/up-XP.png deleted file mode 100644 index 851502d47..000000000 Binary files a/toolkit/themes/windows/global/dirListing/up-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css index 20a190684..aaddef882 100644 --- a/toolkit/themes/windows/global/global.css +++ b/toolkit/themes/windows/global/global.css @@ -350,9 +350,7 @@ popupnotificationcontent { width: 20px; } -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { .close-icon { -moz-image-region: rect(0, 16px, 16px, 0); } @@ -386,9 +384,7 @@ popupnotificationcontent { -moz-image-region: rect(0, 120px, 40px, 80px); } - @media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { .close-icon { -moz-image-region: rect(0, 32px, 32px, 0); } diff --git a/toolkit/themes/windows/global/icons/Landscape-XP.png b/toolkit/themes/windows/global/icons/Landscape-XP.png deleted file mode 100644 index cc43abdf3..000000000 Binary files a/toolkit/themes/windows/global/icons/Landscape-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Portrait-XP.png b/toolkit/themes/windows/global/icons/Portrait-XP.png deleted file mode 100644 index ce36e8413..000000000 Binary files a/toolkit/themes/windows/global/icons/Portrait-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Print-preview-XP.png b/toolkit/themes/windows/global/icons/Print-preview-XP.png deleted file mode 100644 index 6f4736737..000000000 Binary files a/toolkit/themes/windows/global/icons/Print-preview-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Question-XP.png b/toolkit/themes/windows/global/icons/Question-XP.png deleted file mode 100644 index c10004078..000000000 Binary files a/toolkit/themes/windows/global/icons/Question-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Search-close-XP.png b/toolkit/themes/windows/global/icons/Search-close-XP.png deleted file mode 100644 index 39d800e1a..000000000 Binary files a/toolkit/themes/windows/global/icons/Search-close-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Search-glass-XP.png b/toolkit/themes/windows/global/icons/Search-glass-XP.png deleted file mode 100644 index 9eb0e259f..000000000 Binary files a/toolkit/themes/windows/global/icons/Search-glass-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/Warning-XP.png b/toolkit/themes/windows/global/icons/Warning-XP.png deleted file mode 100644 index c0ec9b519..000000000 Binary files a/toolkit/themes/windows/global/icons/Warning-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/autoscroll-XP.png b/toolkit/themes/windows/global/icons/autoscroll-XP.png deleted file mode 100644 index 6aac3d98e..000000000 Binary files a/toolkit/themes/windows/global/icons/autoscroll-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png b/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png deleted file mode 100644 index 74af56f57..000000000 Binary files a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/blacklist_large-XP.png b/toolkit/themes/windows/global/icons/blacklist_large-XP.png deleted file mode 100644 index 96ff341c0..000000000 Binary files a/toolkit/themes/windows/global/icons/blacklist_large-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/close-XPVista7.png b/toolkit/themes/windows/global/icons/close-XPVista7.png deleted file mode 100644 index ea6ada49e..000000000 Binary files a/toolkit/themes/windows/global/icons/close-XPVista7.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-XPVista7@2x.png deleted file mode 100644 index c25a64a4b..000000000 Binary files a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png b/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png deleted file mode 100644 index 68596a307..000000000 Binary files a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png deleted file mode 100644 index eec52e6d1..000000000 Binary files a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/close-inverted-win7.png b/toolkit/themes/windows/global/icons/close-inverted-win7.png new file mode 100644 index 000000000..68596a307 Binary files /dev/null and b/toolkit/themes/windows/global/icons/close-inverted-win7.png differ diff --git a/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png new file mode 100644 index 000000000..eec52e6d1 Binary files /dev/null and b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png differ diff --git a/toolkit/themes/windows/global/icons/close-win7.png b/toolkit/themes/windows/global/icons/close-win7.png new file mode 100644 index 000000000..ea6ada49e Binary files /dev/null and b/toolkit/themes/windows/global/icons/close-win7.png differ diff --git a/toolkit/themes/windows/global/icons/close-win7@2x.png b/toolkit/themes/windows/global/icons/close-win7@2x.png new file mode 100644 index 000000000..c25a64a4b Binary files /dev/null and b/toolkit/themes/windows/global/icons/close-win7@2x.png differ diff --git a/toolkit/themes/windows/global/icons/error-16-XP.png b/toolkit/themes/windows/global/icons/error-16-XP.png deleted file mode 100644 index 936d2abeb..000000000 Binary files a/toolkit/themes/windows/global/icons/error-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/error-64-XP.png b/toolkit/themes/windows/global/icons/error-64-XP.png deleted file mode 100644 index 75a00c490..000000000 Binary files a/toolkit/themes/windows/global/icons/error-64-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/folder-item-XP.png b/toolkit/themes/windows/global/icons/folder-item-XP.png deleted file mode 100644 index 26cda98c9..000000000 Binary files a/toolkit/themes/windows/global/icons/folder-item-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/information-16-XP.png b/toolkit/themes/windows/global/icons/information-16-XP.png deleted file mode 100644 index aa8ce6e88..000000000 Binary files a/toolkit/themes/windows/global/icons/information-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/information-24-XP.png b/toolkit/themes/windows/global/icons/information-24-XP.png deleted file mode 100644 index 7fa782d58..000000000 Binary files a/toolkit/themes/windows/global/icons/information-24-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/information-32-XP.png b/toolkit/themes/windows/global/icons/information-32-XP.png deleted file mode 100644 index 5120db685..000000000 Binary files a/toolkit/themes/windows/global/icons/information-32-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/question-16-XP.png b/toolkit/themes/windows/global/icons/question-16-XP.png deleted file mode 100644 index 0c8eafda0..000000000 Binary files a/toolkit/themes/windows/global/icons/question-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/question-64-XP.png b/toolkit/themes/windows/global/icons/question-64-XP.png deleted file mode 100644 index a1a51b8d8..000000000 Binary files a/toolkit/themes/windows/global/icons/question-64-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/sslWarning-XP.png b/toolkit/themes/windows/global/icons/sslWarning-XP.png deleted file mode 100644 index 09946986f..000000000 Binary files a/toolkit/themes/windows/global/icons/sslWarning-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/warning-16-XP.png b/toolkit/themes/windows/global/icons/warning-16-XP.png deleted file mode 100644 index a21574370..000000000 Binary files a/toolkit/themes/windows/global/icons/warning-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/warning-64-XP.png b/toolkit/themes/windows/global/icons/warning-64-XP.png deleted file mode 100644 index 832f34886..000000000 Binary files a/toolkit/themes/windows/global/icons/warning-64-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/warning-large-XP.png b/toolkit/themes/windows/global/icons/warning-large-XP.png deleted file mode 100644 index 0ec8e79f6..000000000 Binary files a/toolkit/themes/windows/global/icons/warning-large-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/icons/windowControls-XP.png b/toolkit/themes/windows/global/icons/windowControls-XP.png deleted file mode 100644 index d90efb05b..000000000 Binary files a/toolkit/themes/windows/global/icons/windowControls-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 7f0771020..7f2f29942 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -44,102 +44,36 @@ toolkit.jar: 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-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-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/close-win7.png (icons/close-win7.png) + skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png) + skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png) + skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png) skin/classic/global/icons/resizer.png (icons/resizer.png) skin/classic/global/icons/sslWarning.png (icons/sslWarning.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/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) - skin/classic/global/icons/Error-XP.png (icons/Error-XP.png) - skin/classic/global/icons/error-16-XP.png (icons/error-16-XP.png) - skin/classic/global/icons/error-64-XP.png (icons/error-64-XP.png) - skin/classic/global/icons/folder-item-XP.png (icons/folder-item-XP.png) - skin/classic/global/icons/information-16-XP.png (icons/information-16-XP.png) - skin/classic/global/icons/information-24-XP.png (icons/information-24-XP.png) - skin/classic/global/icons/information-32-XP.png (icons/information-32-XP.png) - skin/classic/global/icons/Print-preview-XP.png (icons/Print-preview-XP.png) - skin/classic/global/icons/Portrait-XP.png (icons/Portrait-XP.png) - skin/classic/global/icons/Landscape-XP.png (icons/Landscape-XP.png) - skin/classic/global/icons/Question-XP.png (icons/Question-XP.png) - skin/classic/global/icons/question-16-XP.png (icons/question-16-XP.png) - skin/classic/global/icons/question-64-XP.png (icons/question-64-XP.png) - skin/classic/global/icons/Search-close-XP.png (icons/Search-close-XP.png) - skin/classic/global/icons/Search-glass-XP.png (icons/Search-glass-XP.png) - skin/classic/global/icons/sslWarning-XP.png (icons/sslWarning-XP.png) - skin/classic/global/icons/Warning-XP.png (icons/Warning-XP.png) - skin/classic/global/icons/warning-large-XP.png (icons/warning-large-XP.png) - skin/classic/global/icons/warning-16-XP.png (icons/warning-16-XP.png) - skin/classic/global/icons/warning-64-XP.png (icons/warning-64-XP.png) - skin/classic/global/icons/windowControls-XP.png (icons/windowControls-XP.png) - skin/classic/global/toolbar/spring-XP.png (toolbar/spring-XP.png) - skin/classic/global/tree/sort-asc-XP.png (tree/sort-asc-XP.png) - skin/classic/global/tree/sort-dsc-XP.png (tree/sort-dsc-XP.png) - skin/classic/global/tree/twisty.svg (tree/twisty.svg) - skin/classic/global/tree/twisty-XP.svg (tree/twisty-XP.svg) - skin/classic/global/tree/twisty-Vista78.svg (tree/twisty-Vista78.svg) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) + skin/classic/global/tree/twisty.svg (tree/twisty.svg) + skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg) #ifdef MOZ_PHOENIX [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/dirListing/folder.png chrome://global/skin/dirListing/folder-XP.png osversion<6 -% override chrome://global/skin/dirListing/local.png chrome://global/skin/dirListing/local-XP.png osversion<6 -% override chrome://global/skin/dirListing/remote.png chrome://global/skin/dirListing/remote-XP.png osversion<6 -% override chrome://global/skin/dirListing/up.png chrome://global/skin/dirListing/up-XP.png osversion<6 -% override chrome://global/skin/icons/autoscroll.png chrome://global/skin/icons/autoscroll-XP.png osversion<6 -% override chrome://global/skin/icons/blacklist_favicon.png chrome://global/skin/icons/blacklist_favicon-XP.png osversion<6 -% override chrome://global/skin/icons/blacklist_large.png chrome://global/skin/icons/blacklist_large-XP.png osversion<6 -% override chrome://global/skin/icons/Error.png chrome://global/skin/icons/Error-XP.png osversion<6 -% override chrome://global/skin/icons/error-16.png chrome://global/skin/icons/error-16-XP.png osversion<6 -% override chrome://global/skin/icons/error-64.png chrome://global/skin/icons/error-64-XP.png osversion<6 -% override chrome://global/skin/icons/folder-item.png chrome://global/skin/icons/folder-item-XP.png osversion<6 -% override chrome://global/skin/icons/information-16.png chrome://global/skin/icons/information-16-XP.png osversion<6 -% override chrome://global/skin/icons/information-24.png chrome://global/skin/icons/information-24-XP.png osversion<6 -% override chrome://global/skin/icons/information-32.png chrome://global/skin/icons/information-32-XP.png osversion<6 -% override chrome://global/skin/icons/Print-preview.png chrome://global/skin/icons/Print-preview-XP.png osversion<6 -% override chrome://global/skin/icons/Portrait.png chrome://global/skin/icons/Portrait-XP.png osversion<6 -% override chrome://global/skin/icons/Landscape.png chrome://global/skin/icons/Landscape-XP.png osversion<6 -% override chrome://global/skin/icons/Question.png chrome://global/skin/icons/Question-XP.png osversion<6 -% override chrome://global/skin/icons/question-16.png chrome://global/skin/icons/question-16-XP.png osversion<6 -% override chrome://global/skin/icons/question-64.png chrome://global/skin/icons/question-64-XP.png osversion<6 -% override chrome://global/skin/icons/Search-close.png chrome://global/skin/icons/Search-close-XP.png osversion<6 -% override chrome://global/skin/icons/Search-glass.png chrome://global/skin/icons/Search-glass-XP.png osversion<6 -% override chrome://global/skin/icons/sslWarning.png chrome://global/skin/icons/sslWarning-XP.png osversion<6 -% override chrome://global/skin/icons/Warning.png chrome://global/skin/icons/Warning-XP.png osversion<6 -% override chrome://global/skin/icons/warning-large.png chrome://global/skin/icons/warning-large-XP.png osversion<6 -% override chrome://global/skin/icons/warning-16.png chrome://global/skin/icons/warning-16-XP.png osversion<6 -% override chrome://global/skin/icons/warning-64.png chrome://global/skin/icons/warning-64-XP.png osversion<6 -% override chrome://global/skin/icons/windowControls.png chrome://global/skin/icons/windowControls-XP.png osversion<6 -% override chrome://global/skin/toolbar/spring.png chrome://global/skin/toolbar/spring-XP.png osversion<6 -% override chrome://global/skin/tree/sort-asc.png chrome://global/skin/tree/sort-asc-XP.png osversion<6 -% override chrome://global/skin/tree/sort-dsc.png chrome://global/skin/tree/sort-dsc-XP.png osversion<6 -% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-XPVista7.png osversion<=6.1 -% 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 +% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-win7.png osversion<=6.1 +% override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-win7@2x.png osversion<=6.1 +% override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-win7.png osversion<=6.1 +% override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-win7@2x.png osversion<=6.1 -% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-Vista78.svg#clsd osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-Vista78.svg#open osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-rtl osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-Vista78.svg#open-hover osversion<=6.3 -% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-hover-rtl osversion<=6.3 -# to be sure osversion<6 has always higher precedence than osversion<=6.3 we override twisty-Vista78.svg instead of twisty.svg -% override chrome://global/skin/tree/twisty-Vista78.svg#clsd chrome://global/skin/tree/twisty-XP.svg#clsd osversion<6 -% override chrome://global/skin/tree/twisty-Vista78.svg#open chrome://global/skin/tree/twisty-XP.svg#open osversion<6 +% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-preWin10.svg#clsd osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-preWin10.svg#open osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-rtl osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-preWin10.svg#open-hover osversion<=6.3 +% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-hover-rtl osversion<=6.3 diff --git a/toolkit/themes/windows/global/listbox.css b/toolkit/themes/windows/global/listbox.css index fd60b1693..ddea3f8fa 100644 --- a/toolkit/themes/windows/global/listbox.css +++ b/toolkit/themes/windows/global/listbox.css @@ -144,70 +144,67 @@ listheader[sortable="true"]:hover:active { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - listitem { - --listitem-selectedColor: rgb(217,217,217); - --listitem-selectedBorder: var(--listitem-selectedColor); - --listitem-selectedBottomBorder: rgb(204,204,204); - --listitem-selectedBackground: var(--listitem-selectedColor); - --listitem-selectedImage: none; - --listitem-selectedCurrentBorder: rgb(123,195,255); - --listitem-selectedFocusColor: rgb(205,232,255); - --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor); - --listitem-selectedFocusBottomBorder: rgb(165,214,255); - --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor); - --listitem-selectedFocusImage: none; - --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor); - --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder); - --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor); - - color: -moz-FieldText; - margin-inline-start: 1px; - margin-inline-end: 1px; - padding-top: 1px; - padding-bottom: 1px; - border-width: 1px; - background-repeat: no-repeat; - background-size: 100% 100%; - } + listitem { + --listitem-selectedColor: rgb(217,217,217); + --listitem-selectedBorder: var(--listitem-selectedColor); + --listitem-selectedBottomBorder: rgb(204,204,204); + --listitem-selectedBackground: var(--listitem-selectedColor); + --listitem-selectedImage: none; + --listitem-selectedCurrentBorder: rgb(123,195,255); + --listitem-selectedFocusColor: rgb(205,232,255); + --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor); + --listitem-selectedFocusBottomBorder: rgb(165,214,255); + --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor); + --listitem-selectedFocusImage: none; + --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor); + --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder); + --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor); + + color: -moz-FieldText; + margin-inline-start: 1px; + margin-inline-end: 1px; + padding-top: 1px; + padding-bottom: 1px; + border-width: 1px; + background-repeat: no-repeat; + background-size: 100% 100%; + } - listitem[selected="true"] { - border-top-color: var(--listitem-selectedBorder); - border-right-color: var(--listitem-selectedBorder); - border-left-color: var(--listitem-selectedBorder); - border-bottom-color: var(--listitem-selectedBottomBorder); - background-image: var(--listitem-selectedImage); - background-color: var(--listitem-selectedBackground); - color: -moz-DialogText; - } + listitem[selected="true"] { + border-top-color: var(--listitem-selectedBorder); + border-right-color: var(--listitem-selectedBorder); + border-left-color: var(--listitem-selectedBorder); + border-bottom-color: var(--listitem-selectedBottomBorder); + background-image: var(--listitem-selectedImage); + background-color: var(--listitem-selectedBackground); + color: -moz-DialogText; + } - listbox:focus > listitem[selected="true"] { - border-top-color: var(--listitem-selectedFocusBorder); - border-right-color: var(--listitem-selectedFocusBorder); - border-left-color: var(--listitem-selectedFocusBorder); - border-bottom-color: var(--listitem-selectedFocusBottomBorder); - background-image: var(--listitem-selectedFocusImage); - background-color: var(--listitem-selectedFocusBackground); - color: -moz-DialogText; - } + listbox:focus > listitem[selected="true"] { + border-top-color: var(--listitem-selectedFocusBorder); + border-right-color: var(--listitem-selectedFocusBorder); + border-left-color: var(--listitem-selectedFocusBorder); + border-bottom-color: var(--listitem-selectedFocusBottomBorder); + background-image: var(--listitem-selectedFocusImage); + background-color: var(--listitem-selectedFocusBackground); + color: -moz-DialogText; + } - listbox:focus > listitem[current="true"] { - border-color: var(--listitem-selectedCurrentBorder); - outline: none; - } + listbox:focus > listitem[current="true"] { + border-color: var(--listitem-selectedCurrentBorder); + outline: none; + } - listbox:focus > listitem[selected="true"][current="true"] { - border-top-color: var(--listitem-selectedFocusCurrentBorder); - border-right-color: var(--listitem-selectedFocusCurrentBorder); - border-left-color: var(--listitem-selectedFocusCurrentBorder); - border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder); - background-color: var(--listitem-selectedFocusCurrentBackground); - outline: none; - } + listbox:focus > listitem[selected="true"][current="true"] { + border-top-color: var(--listitem-selectedFocusCurrentBorder); + border-right-color: var(--listitem-selectedFocusCurrentBorder); + border-left-color: var(--listitem-selectedFocusCurrentBorder); + border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder); + background-color: var(--listitem-selectedFocusCurrentBackground); + outline: none; } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { + @media (-moz-os-version: windows-win7) { listitem { --listitem-selectedBottomBorder: var(--listitem-selectedColor); --listitem-selectedBackground: rgba(190,190,190,.15); diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css index 2a228251d..c22aedd7a 100644 --- a/toolkit/themes/windows/global/menu.css +++ b/toolkit/themes/windows/global/menu.css @@ -148,15 +148,13 @@ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - menubar > menu:-moz-lwtheme { - -moz-appearance: menuitem; - } - - menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { - color: inherit !important; - text-shadow: inherit; - } + menubar > menu:-moz-lwtheme { + -moz-appearance: menuitem; + } + + menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { + color: inherit !important; + text-shadow: inherit; } } diff --git a/toolkit/themes/windows/global/menulist.css b/toolkit/themes/windows/global/menulist.css index 9480bffda..de24dbdde 100644 --- a/toolkit/themes/windows/global/menulist.css +++ b/toolkit/themes/windows/global/menulist.css @@ -82,12 +82,6 @@ menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { border: 1px dotted ThreeDDarkShadow; } -@media (-moz-os-version: windows-xp) { - menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { - border: 1px dotted #F5DB95; - } -} - /* ..... disabled state ..... */ menulist[disabled="true"] { @@ -113,31 +107,29 @@ html|*.menulist-editable-input { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - .menulist-label-box { - background-color: transparent !important; - color: inherit !important; - } - - .menulist-label { - margin-top: -1px !important; - margin-bottom: -1px !important; - margin-inline-start: 0 !important; - } - - .menulist-description { - margin-inline-start: 1ex !important; - } - - menulist:not([editable="true"]) > .menulist-dropmarker { - margin-top: -2px; - margin-inline-start: 3px; - margin-inline-end: -3px; - } - - .menulist-icon { - margin-top: -1px; - margin-bottom: -1px; - } + .menulist-label-box { + background-color: transparent !important; + color: inherit !important; + } + + .menulist-label { + margin-top: -1px !important; + margin-bottom: -1px !important; + margin-inline-start: 0 !important; + } + + .menulist-description { + margin-inline-start: 1ex !important; + } + + menulist:not([editable="true"]) > .menulist-dropmarker { + margin-top: -2px; + margin-inline-start: 3px; + margin-inline-end: -3px; + } + + .menulist-icon { + margin-top: -1px; + margin-bottom: -1px; } } diff --git a/toolkit/themes/windows/global/popup.css b/toolkit/themes/windows/global/popup.css index 010e85a93..e5c3c4500 100644 --- a/toolkit/themes/windows/global/popup.css +++ b/toolkit/themes/windows/global/popup.css @@ -58,9 +58,7 @@ panel[type="arrow"][side="right"] { } %ifdef XP_WIN -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { %endif .panel-arrowcontent { border-radius: 4px; diff --git a/toolkit/themes/windows/global/textbox.css b/toolkit/themes/windows/global/textbox.css index 78ca7f320..7b136a0ea 100644 --- a/toolkit/themes/windows/global/textbox.css +++ b/toolkit/themes/windows/global/textbox.css @@ -37,10 +37,8 @@ html|*.textbox-textarea { } @media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - textbox html|*.textbox-input::placeholder { - font-style: italic; - } + textbox html|*.textbox-input::placeholder { + font-style: italic; } } diff --git a/toolkit/themes/windows/global/toolbar/spring-XP.png b/toolkit/themes/windows/global/toolbar/spring-XP.png deleted file mode 100644 index e20f602c2..000000000 Binary files a/toolkit/themes/windows/global/toolbar/spring-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/toolbarbutton.css b/toolkit/themes/windows/global/toolbarbutton.css index e96e529cf..ac3c7ba4a 100644 --- a/toolkit/themes/windows/global/toolbarbutton.css +++ b/toolkit/themes/windows/global/toolbarbutton.css @@ -84,17 +84,11 @@ toolbarbutton[checked="true"]:not([disabled="true"]) { text-shadow: none; } - toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) { + toolbarbutton:-moz-lwtheme:not([disabled="true"]) { color: inherit; text-shadow: inherit; } - @media not all and (-moz-os-version: windows-xp) { - toolbarbutton:-moz-lwtheme:not([disabled="true"]) { - color: inherit; - text-shadow: inherit; - } - } } @media not all and (-moz-windows-default-theme) { diff --git a/toolkit/themes/windows/global/tree.css b/toolkit/themes/windows/global/tree.css index 130096824..2b4957c6c 100644 --- a/toolkit/themes/windows/global/tree.css +++ b/toolkit/themes/windows/global/tree.css @@ -310,7 +310,7 @@ treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descend /* ::::: twisty ::::: */ treechildren::-moz-tree-twisty { - padding-inline-end: 4px; + padding-inline-end: 1px; padding-top: 1px; width: 9px; /* The image's width is 9 pixels */ list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd"); @@ -320,8 +320,32 @@ treechildren::-moz-tree-twisty(open) { list-style-image: url("chrome://global/skin/tree/twisty.svg#open"); } +treechildren::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); +} + +treechildren::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); +} + treechildren::-moz-tree-indentation { - width: 18px; + width: 12px; } /* ::::: gridline style ::::: */ @@ -370,233 +394,196 @@ treechildren::-moz-tree-cell-text(active, selected, editing) { } %ifdef XP_WIN -@media not all and (-moz-os-version: windows-xp) { - /* ::::: twisty ::::: */ - - treechildren::-moz-tree-indentation { - width: 12px; +@media (-moz-windows-default-theme) { + treechildren { + --treechildren-outline: none; + --treechildren-2ndBorderColor: rgba(255,255,255,.4); + --treechildren-selectedColor: rgb(217,217,217); + --treechildren-focusColor: rgb(123,195,255); + --treechildren-selectedFocusColor: rgb(205,232,255); + --treechildren-currentColor: rgb(125,162,206); + --treechildren-hoverColor: rgb(229,243,255); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: rgb(204,204,204); + --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217)); + --treechildren-selectedBackground: transparent; + --treechildren-currentFocusBorder: var(--treechildren-focusColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusBottomBorder: rgb(165,214,255); + --treechildren-selectedFocusImage: none; + --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); + --treechildren-hoverBorder: var(--treechildren-hoverColor); + --treechildren-hoverBottomBorder: var(--treechildren-hoverColor); + --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); } - treechildren::-moz-tree-twisty { - padding-inline-end: 1px; + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + height: 1.8em; + color: -moz-FieldText; + margin-inline-start: 1px; + margin-inline-end: 1px; + border-width: 1px; + border-color: transparent; + background-repeat: no-repeat; + background-size: 100% 100%; } - treechildren::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { + -moz-border-top-colors: var(--treechildren-selectedBorder); + -moz-border-right-colors: var(--treechildren-selectedBorder); + -moz-border-left-colors: var(--treechildren-selectedBorder); + -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder); + background-image: var(--treechildren-selectedImage); + background-color: var(--treechildren-selectedBackground); + outline: var(--treechildren-outline); } - treechildren::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-currentFocusBorder); + -moz-border-right-colors: var(--treechildren-currentFocusBorder); + -moz-border-left-colors: var(--treechildren-currentFocusBorder); + -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder); + outline: var(--treechildren-outline); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus), + treechildren::-moz-tree-row(dropOn) { + -moz-border-top-colors: var(--treechildren-selectedFocusBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder); + background-image: var(--treechildren-selectedFocusImage); + background-color: var(--treechildren-selectedFocusBackground); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder); + background-image: var(--treechildren-selectedFocusCurrentImage); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) { + -moz-border-top-colors: var(--treechildren-hoverBorder); + -moz-border-right-colors: var(--treechildren-hoverBorder); + -moz-border-left-colors: var(--treechildren-hoverBorder); + -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder); + background-image: var(--treechildren-hoverImage); + outline: var(--treechildren-outline); } - treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) { + -moz-border-top-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-right-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-left-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder); + background-image: var(--treechildren-hoverCurrentImage); } - @media (-moz-windows-default-theme) { - treechildren { - --treechildren-outline: none; - --treechildren-2ndBorderColor: rgba(255,255,255,.4); - --treechildren-selectedColor: rgb(217,217,217); - --treechildren-focusColor: rgb(123,195,255); - --treechildren-selectedFocusColor: rgb(205,232,255); - --treechildren-currentColor: rgb(125,162,206); - --treechildren-hoverColor: rgb(229,243,255); - --treechildren-selectedBorder: var(--treechildren-selectedColor); - --treechildren-selectedBottomBorder: rgb(204,204,204); - --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217)); - --treechildren-selectedBackground: transparent; - --treechildren-currentFocusBorder: var(--treechildren-focusColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor); - --treechildren-selectedFocusBottomBorder: rgb(165,214,255); - --treechildren-selectedFocusImage: none; - --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor); - --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); - --treechildren-hoverBorder: var(--treechildren-hoverColor); - --treechildren-hoverBottomBorder: var(--treechildren-hoverColor); - --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255)); - --treechildren-hoverCurrentBorder: var(--treechildren-currentColor); - --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor); - --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-focusColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor); - --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row { - height: 1.8em; - color: -moz-FieldText; - margin-inline-start: 1px; - margin-inline-end: 1px; - border-width: 1px; - border-color: transparent; - background-repeat: no-repeat; - background-size: 100% 100%; - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { - -moz-border-top-colors: var(--treechildren-selectedBorder); - -moz-border-right-colors: var(--treechildren-selectedBorder); - -moz-border-left-colors: var(--treechildren-selectedBorder); - -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder); - background-image: var(--treechildren-selectedImage); - background-color: var(--treechildren-selectedBackground); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) { - border-style: solid; - -moz-border-top-colors: var(--treechildren-currentFocusBorder); - -moz-border-right-colors: var(--treechildren-currentFocusBorder); - -moz-border-left-colors: var(--treechildren-currentFocusBorder); - -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus), - treechildren::-moz-tree-row(dropOn) { - -moz-border-top-colors: var(--treechildren-selectedFocusBorder); - -moz-border-right-colors: var(--treechildren-selectedFocusBorder); - -moz-border-left-colors: var(--treechildren-selectedFocusBorder); - -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder); - background-image: var(--treechildren-selectedFocusImage); - background-color: var(--treechildren-selectedFocusBackground); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) { - border-style: solid; - -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder); - -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder); - background-image: var(--treechildren-selectedFocusCurrentImage); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) { - -moz-border-top-colors: var(--treechildren-hoverBorder); - -moz-border-right-colors: var(--treechildren-hoverBorder); - -moz-border-left-colors: var(--treechildren-hoverBorder); - -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder); - background-image: var(--treechildren-hoverImage); - outline: var(--treechildren-outline); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) { - -moz-border-top-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-right-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-left-colors: var(--treechildren-hoverCurrentBorder); - -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder); - background-image: var(--treechildren-hoverCurrentImage); - } + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) { + -moz-border-top-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-right-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-left-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder); + background-image: var(--treechildren-hoverSelectedImage); + } - treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) { - -moz-border-top-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-right-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-left-colors: var(--treechildren-hoverSelectedBorder); - -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder); - background-image: var(--treechildren-hoverSelectedImage); - } + tree[disabled="true"] > treechildren::-moz-tree-row { + background: none; + -moz-border-top-colors: transparent; + -moz-border-right-colors: transparent; + -moz-border-left-colors: transparent; + -moz-border-bottom-colors: transparent; + } - tree[disabled="true"] > treechildren::-moz-tree-row { - background: none; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-left-colors: transparent; - -moz-border-bottom-colors: transparent; - } + treechildren::-moz-tree-cell(dropOn) { + background-image: none; + background-color: transparent; + border-radius: 0; + } - treechildren::-moz-tree-cell(dropOn) { - background-image: none; - background-color: transparent; - border-radius: 0; - } + treechildren::-moz-tree-cell-text(primary, dropOn) { + color: -moz-FieldText; + } - treechildren::-moz-tree-cell-text(primary, dropOn) { - color: -moz-FieldText; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text { + padding-bottom: initial; + border-color: transparent; + background-color: transparent; + } - treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text { - padding-bottom: initial; - border-color: transparent; - background-color: transparent; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) { + color: -moz-DialogText; + } - treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) { - color: -moz-DialogText; + @media (-moz-os-version: windows-win7) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6); + --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor); + --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); } - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - treechildren { - --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); - --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6); - --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor); - --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4)); - --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375)); - --treechildren-selectedFocusBackground: transparent; - --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); - --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor); - --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); - --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); - --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); - } - - treechildren:not(.autocomplete-treebody)::-moz-tree-row { - border-width: 2px; - border-radius: 3px; - -moz-outline-radius: 3px; - } + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + border-width: 2px; + border-radius: 3px; + -moz-outline-radius: 3px; } + } - @media (-moz-os-version: windows-win8) { - treechildren { - --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); - --treechildren-selectedBorder: var(--treechildren-selectedColor); - --treechildren-selectedBottomBorder: var(--treechildren-selectedColor); - --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4)); - --treechildren-currentFocusBorder: var(--treechildren-currentColor); - --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); - --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375)); - --treechildren-selectedFocusBackground: transparent; - --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor); - --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); - --treechildren-hoverBorder: rgb(184,214,251); - --treechildren-hoverBottomBorder: rgb(184,214,251); - --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); - --treechildren-hoverSelectedBorder: var(--treechildren-currentColor); - --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor); - --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); - } + @media (-moz-os-version: windows-win8) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251); + --treechildren-hoverBottomBorder: rgb(184,214,251); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); } } } diff --git a/toolkit/themes/windows/global/tree/sort-asc-XP.png b/toolkit/themes/windows/global/tree/sort-asc-XP.png deleted file mode 100644 index 64d077a8f..000000000 Binary files a/toolkit/themes/windows/global/tree/sort-asc-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/tree/sort-dsc-XP.png b/toolkit/themes/windows/global/tree/sort-dsc-XP.png deleted file mode 100644 index 9c4a82587..000000000 Binary files a/toolkit/themes/windows/global/tree/sort-dsc-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/global/tree/twisty-Vista78.svg b/toolkit/themes/windows/global/tree/twisty-Vista78.svg deleted file mode 100644 index 0a6908634..000000000 --- a/toolkit/themes/windows/global/tree/twisty-Vista78.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/themes/windows/global/tree/twisty-XP.svg b/toolkit/themes/windows/global/tree/twisty-XP.svg deleted file mode 100644 index 66219d513..000000000 --- a/toolkit/themes/windows/global/tree/twisty-XP.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/themes/windows/global/tree/twisty-preWin10.svg b/toolkit/themes/windows/global/tree/twisty-preWin10.svg new file mode 100644 index 000000000..0a6908634 --- /dev/null +++ b/toolkit/themes/windows/global/tree/twisty-preWin10.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png b/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png deleted file mode 100644 index d36385ce5..000000000 Binary files a/toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png b/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png deleted file mode 100644 index 8225b6c2d..000000000 Binary files a/toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 5986f18f1..29203811f 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -22,16 +22,8 @@ toolkit.jar: skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) * skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) - skin/classic/mozapps/extensions/category-discover-XP.png (webextensions/category-discover-XP.png) - skin/classic/mozapps/extensions/category-plugins-XP.png (webextensions/category-plugins-XP.png) - skin/classic/mozapps/extensions/category-recent-XP.png (webextensions/category-recent-XP.png) - skin/classic/mozapps/extensions/category-available-XP.png (webextensions/category-available-XP.png) - skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (webextensions/extensionGeneric-16-XP.png) - skin/classic/mozapps/extensions/themeGeneric-XP.png (webextensions/themeGeneric-XP.png) - skin/classic/mozapps/extensions/themeGeneric-16-XP.png (webextensions/themeGeneric-16-XP.png) - skin/classic/mozapps/extensions/localeGeneric-XP.png (webextensions/localeGeneric-XP.png) #else - skin/classic/mozapps/extensions/about.css (extensions/about.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) @@ -82,33 +74,9 @@ toolkit.jar: 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) - 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/plugins/pluginGeneric-XP.png (plugins/pluginGeneric-XP.png) - skin/classic/mozapps/plugins/pluginBlocked-XP.png (plugins/pluginBlocked-XP.png) - skin/classic/mozapps/plugins/pluginGeneric-16-XP.png (plugins/pluginGeneric-16-XP.png) - skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png) - skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png) #ifdef MOZ_PHOENIX [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/downloads/downloadButtons.png chrome://mozapps/skin/downloads/downloadButtons-XP.png osversion<6 -% override chrome://mozapps/skin/downloads/downloadIcon.png chrome://mozapps/skin/downloads/downloadIcon-XP.png osversion<6 -#ifdef MOZ_WEBEXTENSIONS -% override chrome://mozapps/skin/extensions/category-discover.png chrome://mozapps/skin/extensions/category-discover-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-plugins.png chrome://mozapps/skin/extensions/category-plugins-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-recent.png chrome://mozapps/skin/extensions/category-recent-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/category-available.png chrome://mozapps/skin/extensions/category-available-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/extensionGeneric-16.png chrome://mozapps/skin/extensions/extensionGeneric-16-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/themeGeneric.png chrome://mozapps/skin/extensions/themeGeneric-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/themeGeneric-16.png chrome://mozapps/skin/extensions/themeGeneric-16-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/localeGeneric.png chrome://mozapps/skin/extensions/localeGeneric-XP.png osversion<6 -#endif -% override chrome://mozapps/skin/plugins/pluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-XP.png osversion<6 -% override chrome://mozapps/skin/plugins/pluginBlocked.png chrome://mozapps/skin/plugins/pluginBlocked-XP.png osversion<6 -% 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 diff --git a/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png deleted file mode 100644 index 954036c1f..000000000 Binary files a/toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png deleted file mode 100644 index d6dffb29b..000000000 Binary files a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png deleted file mode 100644 index 3e6d43c9a..000000000 Binary files a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/profile/profileicon-XP.png b/toolkit/themes/windows/mozapps/profile/profileicon-XP.png deleted file mode 100644 index 0854ee177..000000000 Binary files a/toolkit/themes/windows/mozapps/profile/profileicon-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png b/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png deleted file mode 100644 index d36385ce5..000000000 Binary files a/toolkit/themes/windows/mozapps/update/downloadButtons-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png deleted file mode 100644 index d1b737ab0..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png deleted file mode 100644 index a6f5b49b3..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png deleted file mode 100644 index 5c4d8bf47..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png deleted file mode 100644 index 7ecfc7d4c..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png deleted file mode 100644 index 36e7689a3..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png deleted file mode 100644 index 4d9ac5ad8..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png deleted file mode 100644 index 16d77a4a2..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png deleted file mode 100644 index be645f76d..000000000 Binary files a/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png and /dev/null differ -- cgit v1.2.3 From 4c697043da9fe3f58a7e070dad74eab6972695a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 14:01:05 +0100 Subject: Remove windows-xp and windows-vista from @media(-moz-os-version) --- browser/components/webextensions/extension-win-panel.css | 4 +--- layout/style/nsMediaFeatures.cpp | 2 -- layout/style/test/chrome/bug418986-2.js | 2 -- layout/style/test/test_media_queries.html | 2 -- widget/LookAndFeel.h | 5 +---- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/browser/components/webextensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css index ddafe3ea5..9da6da14c 100644 --- a/browser/components/webextensions/extension-win-panel.css +++ b/browser/components/webextensions/extension-win-panel.css @@ -1,6 +1,4 @@ -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { body { border-radius: 4px; } diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp index 052ce58e8..5a54d5455 100644 --- a/layout/style/nsMediaFeatures.cpp +++ b/layout/style/nsMediaFeatures.cpp @@ -70,8 +70,6 @@ struct OperatingSystemVersionInfo { // Os version identities used in the -moz-os-version media query. const OperatingSystemVersionInfo osVersionStrings[] = { - { LookAndFeel::eOperatingSystemVersion_WindowsXP, L"windows-xp" }, - { LookAndFeel::eOperatingSystemVersion_WindowsVista, L"windows-vista" }, { LookAndFeel::eOperatingSystemVersion_Windows7, L"windows-win7" }, { LookAndFeel::eOperatingSystemVersion_Windows8, L"windows-win8" }, { LookAndFeel::eOperatingSystemVersion_Windows10, L"windows-win10" } diff --git a/layout/style/test/chrome/bug418986-2.js b/layout/style/test/chrome/bug418986-2.js index 4336f4abd..b083f48ee 100644 --- a/layout/style/test/chrome/bug418986-2.js +++ b/layout/style/test/chrome/bug418986-2.js @@ -53,8 +53,6 @@ var suppressed_toggles = [ // Possible values for '-moz-os-version' var windows_versions = [ - "windows-xp", - "windows-vista", "windows-win7", "windows-win8", "windows-win10", diff --git a/layout/style/test/test_media_queries.html b/layout/style/test/test_media_queries.html index 479306a55..d503fad0b 100644 --- a/layout/style/test/test_media_queries.html +++ b/layout/style/test/test_media_queries.html @@ -713,8 +713,6 @@ function run() { expression_should_not_be_parseable("-moz-windows-theme: "); // os version media queries (currently windows only) - expression_should_be_parseable("-moz-os-version: windows-xp"); - expression_should_be_parseable("-moz-os-version: windows-vista"); expression_should_be_parseable("-moz-os-version: windows-win7"); expression_should_be_parseable("-moz-os-version: windows-win8"); expression_should_be_parseable("-moz-os-version: windows-win10"); diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h index 443852330..cf84b3308 100644 --- a/widget/LookAndFeel.h +++ b/widget/LookAndFeel.h @@ -440,10 +440,7 @@ public: * Operating system versions. */ enum OperatingSystemVersion { - // XXX: The XP and Vista values can now be removed (see bug 1330146). - eOperatingSystemVersion_WindowsXP = 0, - eOperatingSystemVersion_WindowsVista, - eOperatingSystemVersion_Windows7, + eOperatingSystemVersion_Windows7 = 2, eOperatingSystemVersion_Windows8, eOperatingSystemVersion_Windows10, eOperatingSystemVersion_Unknown -- cgit v1.2.3