Bug 1406667 - Copy autoscroll.png from toolkit into modern theme. rs=bustage-fix
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 07 Oct 2017 20:10:10 +0200
changeset 29122 f894d93fe2d7741c15d2595128957a1ef7473864
parent 29121 611f64379d918b9ace76988387b0a809b7765018
child 29123 3d4d669c055763b5a4f8973084cc881c88c08beb
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1406667, 1389462
Bug 1406667 - Copy autoscroll.png from toolkit into modern theme. rs=bustage-fix Ports Bug 1389462 [outdated compass icon for the middle click autoscroll].
suite/installer/allowed-dupes.mn
suite/themes/modern/global/icons/autoscroll.png
suite/themes/modern/jar.mn
--- a/suite/installer/allowed-dupes.mn
+++ b/suite/installer/allowed-dupes.mn
@@ -225,18 +225,16 @@ extensions/modern@themes.mozilla.org/chr
 chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-XP.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/category-languages.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/localeGeneric.png
 chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric-XP.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/heart.png
 chrome/toolkit/skin/classic/mozapps/extensions/heart.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/sync/sync-32.png
 chrome/classic/skin/classic/communicator/sync/sync-32.png
-extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/icons/autoscroll.png
-chrome/toolkit/skin/classic/global/icons/autoscroll.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/notification-64.png
 chrome/classic/skin/classic/communicator/icons/notification-64.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/icons/blacklist_large.png
 chrome/toolkit/skin/classic/global/icons/blacklist_large-XP.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/icons/sslWarning.png
 chrome/toolkit/skin/classic/global/icons/sslWarning-XP.png
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/addressbook/icons/contact-generic.png
 chrome/classic/skin/classic/messenger/addressbook/icons/contact-generic.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..95794f822fdd64a74fd821123dce2a9e9a3a4aa0
GIT binary patch
literal 3275
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
GTmJ`#)A&gM
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -268,17 +268,17 @@ modern.jar:
   skin/modern/global/dirListing/dirListing.css                     (global/dirListing/dirListing.css)
   skin/modern/global/filepicker/blank.gif                          (global/filepicker/blank.gif)
   skin/modern/global/filepicker/dir-closed.gif                     (global/filepicker/dir-closed.gif)
   skin/modern/global/filepicker/dir-open.gif                       (global/filepicker/dir-open.gif)
   skin/modern/global/filepicker/folder-up.gif                      (global/filepicker/folder-up.gif)
   skin/modern/global/filepicker/folder-home.gif                    (global/filepicker/folder-home.gif)
   skin/modern/global/filepicker/folder-new.gif                     (global/filepicker/folder-new.gif)
   skin/modern/global/icons/authentication-48.png                   (global/icons/authentication-48.png)
-  skin/modern/global/icons/autoscroll.png                          (/mozilla/toolkit/themes/windows/global/icons/autoscroll.png)
+  skin/modern/global/icons/autoscroll.png                          (global/icons/autoscroll.png)
   skin/modern/global/icons/blacklist_favicon.png                   (global/icons/blacklist_favicon.png)
   skin/modern/global/icons/blacklist_large.png                     (global/icons/blacklist_large.png)
   skin/modern/global/icons/close-act.gif                           (global/icons/close-act.gif)
   skin/modern/global/icons/close-dis.gif                           (global/icons/close-dis.gif)
   skin/modern/global/icons/close-hov.gif                           (global/icons/close-hov.gif)
   skin/modern/global/icons/close.gif                               (global/icons/close.gif)
   skin/modern/global/icons/closebox.gif                            (global/icons/closebox.gif)
   skin/modern/global/icons/Error.png                               (global/icons/Error.png)