diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index faa7504a2e6d..a131b6da45b0 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -76,6 +76,7 @@ browser/features/firefox@getpocket.com/chrome/skin/linux/menuPanel@2x.png browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel.png browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel@2x.png chrome.manifest +chrome/toolkit/skin/classic/global/arrowscrollbox.css chrome/toolkit/skin/classic/global/autocomplete.css chrome/toolkit/skin/classic/global/button.css chrome/toolkit/skin/classic/global/checkbox.css @@ -91,7 +92,6 @@ chrome/toolkit/skin/classic/global/preferences.css chrome/toolkit/skin/classic/global/radio.css chrome/toolkit/skin/classic/global/richlistbox.css chrome/toolkit/skin/classic/global/scrollbars.css -chrome/toolkit/skin/classic/global/scrollbox.css chrome/toolkit/skin/classic/global/splitter.css chrome/toolkit/skin/classic/global/tabbox.css chrome/toolkit/skin/classic/global/textbox.css diff --git a/mobile/android/installer/allowed-dupes.mn b/mobile/android/installer/allowed-dupes.mn index 71b6c27034bc..fc5bbce1f550 100644 --- a/mobile/android/installer/allowed-dupes.mn +++ b/mobile/android/installer/allowed-dupes.mn @@ -5,6 +5,7 @@ # PLEASE DO NOT ADD MORE EXCEPTIONS TO THIS LIST # +chrome/toolkit/skin/classic/global/arrowscrollbox.css chrome/toolkit/skin/classic/global/autocomplete.css chrome/toolkit/skin/classic/global/button.css chrome/toolkit/skin/classic/global/checkbox.css @@ -20,7 +21,6 @@ chrome/toolkit/skin/classic/global/preferences.css chrome/toolkit/skin/classic/global/radio.css chrome/toolkit/skin/classic/global/richlistbox.css chrome/toolkit/skin/classic/global/scrollbars.css -chrome/toolkit/skin/classic/global/scrollbox.css chrome/toolkit/skin/classic/global/splitter.css chrome/toolkit/skin/classic/global/tabbox.css chrome/toolkit/skin/classic/global/textbox.css diff --git a/toolkit/content/widgets/arrowscrollbox.js b/toolkit/content/widgets/arrowscrollbox.js index 6db5ccdff5e6..d081ecd2b823 100644 --- a/toolkit/content/widgets/arrowscrollbox.js +++ b/toolkit/content/widgets/arrowscrollbox.js @@ -23,7 +23,7 @@ get markup() { return ` - + diff --git a/toolkit/themes/mobile/jar.mn b/toolkit/themes/mobile/jar.mn index 8ff65e4e4ad7..b0a387578ecf 100644 --- a/toolkit/themes/mobile/jar.mn +++ b/toolkit/themes/mobile/jar.mn @@ -9,6 +9,7 @@ toolkit.jar: skin/classic/global/aboutMemory.css (global/aboutMemory.css) skin/classic/global/aboutNetworking.css (global/aboutNetworking.css) skin/classic/global/aboutSupport.css (global/aboutSupport.css) + skin/classic/global/arrowscrollbox.css (global/empty.css) skin/classic/global/autocomplete.css (global/empty.css) skin/classic/global/button.css (global/empty.css) skin/classic/global/checkbox.css (global/empty.css) @@ -21,7 +22,6 @@ toolkit.jar: skin/classic/global/popup.css (global/empty.css) skin/classic/global/radio.css (global/empty.css) skin/classic/global/richlistbox.css (global/empty.css) - skin/classic/global/scrollbox.css (global/empty.css) skin/classic/global/splitter.css (global/empty.css) skin/classic/global/tabbox.css (global/empty.css) skin/classic/global/textbox.css (global/empty.css) diff --git a/toolkit/themes/shared/scrollbox.css b/toolkit/themes/shared/arrowscrollbox.css similarity index 100% rename from toolkit/themes/shared/scrollbox.css rename to toolkit/themes/shared/arrowscrollbox.css diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index 65d064c03390..61a61d4dd2f9 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -21,11 +21,11 @@ toolkit.jar: skin/classic/global/aboutLicense.css (../../shared/aboutLicense.css) skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css) skin/classic/global/appPicker.css (../../shared/appPicker.css) +* skin/classic/global/arrowscrollbox.css (../../shared/arrowscrollbox.css) skin/classic/global/config.css (../../shared/config.css) skin/classic/global/datetimeinputpickers.css (../../shared/datetimeinputpickers.css) skin/classic/global/numberinput.css (../../shared/numberinput.css) skin/classic/global/passwordmgr.css (../../shared/passwordmgr.css) -* skin/classic/global/scrollbox.css (../../shared/scrollbox.css) skin/classic/global/icons/arrow-left.svg (../../shared/icons/arrow-left.svg) skin/classic/global/icons/autoscroll.svg (../../shared/icons/autoscroll.svg) skin/classic/global/icons/autoscroll-horizontal.svg (../../shared/icons/autoscroll-horizontal.svg)