--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -218,19 +218,16 @@ richlistitem.download button {
/** When the subview is showing... **/
/* Hide the buttons of all downloads except the one that triggered the
subview. */
#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state:not([showingsubview]) .downloadButton {
visibility: hidden;
}
-#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton {
- display: inline;
-}
/* For the download that triggered the subview, move its button farther to the
right by removing padding so that a minimum amount of the main view's right
edge needs to be shown. */
#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] {
padding: 0;
}
--- a/browser/themes/linux/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/linux/downloads/allDownloadsViewOverlay.css
@@ -4,85 +4,8 @@
%include ../../shared/downloads/allDownloadsViewOverlay.inc.css
/*** List items ***/
:root {
--downloads-item-height: 5em;
}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@item@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@item@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@item@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
deleted file mode 100644
index 0c91695aa5c5351fec6011df01bb2c364f28f749..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/linux/downloads/downloads.css
+++ b/browser/themes/linux/downloads/downloads.css
@@ -27,84 +27,8 @@
}
/*** Highlighted list items ***/
@keyfocus@ @itemFocused@ {
outline: 1px -moz-dialogtext dotted;
outline-offset: -1px;
}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@itemNotFinished@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@itemNotFinished@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@itemNotFinished@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-.downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 16px, 64px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 32px, 64px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(48px, 48px, 64px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(48px, 64px, 64px, 48px);
-}
-
-.downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 16px, 80px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 32px, 80px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 48px, 80px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 64px, 80px, 48px);
-}
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -43,17 +43,16 @@ browser.jar:
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)
skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png)
skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png)
skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
- skin/classic/browser/downloads/buttons.png (downloads/buttons.png)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.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/subscribe.css (feeds/subscribe.css)
skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css)
--- a/browser/themes/osx/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/osx/downloads/allDownloadsViewOverlay.css
@@ -4,170 +4,8 @@
%include ../../shared/downloads/allDownloadsViewOverlay.inc.css
/*** List items ***/
:root {
--downloads-item-height: 6em;
}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@item@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@item@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@item@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-@itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-@itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
-
-@media (min-resolution: 2dppx) {
- .downloadButton {
- list-style-image: url("chrome://browser/skin/downloads/buttons@2x.png");
- }
- .downloadButton > .button-box > .button-icon {
- width: 16px;
- height: 16px;
- }
-
- .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 32px, 0px);
- }
- @item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 64px, 32px, 32px);
- }
- @item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 96px, 32px, 64px);
- }
- @item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 32px, 96px);
- }
- @itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 160px, 32px, 128px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 192px, 32px, 160px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 224px, 32px, 192px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 256px, 32px, 224px);
- }
-
- .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 32px, 64px, 0px);
- }
- @item@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 64px, 64px, 32px);
- }
- @item@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(32px, 96px, 64px, 64px);
- }
- @item@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(32px, 128px, 64px, 96px);
- }
- @itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 160px, 64px, 128px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 192px, 64px, 160px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(32px, 224px, 64px, 192px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(32px, 256px, 64px, 224px);
- }
-
- .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 32px, 96px, 0px);
- }
- @item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 64px, 96px, 32px);
- }
- @item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(64px, 96px, 96px, 64px);
- }
- @item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(64px, 128px, 96px, 96px);
- }
- @itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 160px, 96px, 128px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 192px, 96px, 160px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(64px, 224px, 96px, 192px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(64px, 256px, 96px, 224px);
- }
-}
deleted file mode 100644
index 2aad9c7be2a2a56a9690ab1ea26a5a788399a807..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fba4edbb53abee13b57c2a6b7e39329c5c19ed15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/downloads/downloads.css
+++ b/browser/themes/osx/downloads/downloads.css
@@ -41,293 +41,8 @@
outline: 2px -moz-mac-focusring solid;
outline-offset: -2px;
}
@item@[showingsubview] {
transition: background-color var(--panelui-subview-transition-duration),
color var(--panelui-subview-transition-duration);
}
-
-@notKeyfocus@ @itemFinished@[exists]:hover {
- cursor: pointer;
-}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-@keyfocus@ @itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow,
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow:hover,
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow:active,
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-@keyfocus@ @itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-@keyfocus@ @itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
-
-.downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 16px, 64px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 32px, 64px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(48px, 48px, 64px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(48px, 64px, 64px, 48px);
-}
-@keyfocus@ @itemFocused@ .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 80px, 64px, 64px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 96px, 64px, 80px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(48px, 112px, 64px, 96px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(48px, 128px, 64px, 112px);
-}
-
-.downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 16px, 80px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 32px, 80px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 48px, 80px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 64px, 80px, 48px);
-}
-@keyfocus@ @itemFocused@ .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 80px, 80px, 64px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 96px, 80px, 80px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 112px, 80px, 96px);
-}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 128px, 80px, 112px);
-}
-
-@media (min-resolution: 2dppx) {
- .downloadButton {
- list-style-image: url("chrome://browser/skin/downloads/buttons@2x.png");
- }
- .downloadButton > .button-box > .button-icon {
- width: 16px;
- height: 16px;
- }
-
- .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 32px, 0px);
- }
- @item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 64px, 32px, 32px);
- }
- @item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 96px, 32px, 64px);
- }
- @item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 32px, 96px);
- }
- @keyfocus@ @itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 160px, 32px, 128px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 192px, 32px, 160px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 224px, 32px, 192px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 256px, 32px, 224px);
- }
-
- .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 32px, 64px, 0px);
- }
- @notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow,
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 64px, 64px, 32px);
- }
- @notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow:hover,
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(32px, 96px, 64px, 64px);
- }
- @notKeyfocus@ @itemNotFinished@:hover .downloadButton.downloadIconShow:active,
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(32px, 128px, 64px, 96px);
- }
- @keyfocus@ @itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 160px, 64px, 128px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(32px, 192px, 64px, 160px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(32px, 224px, 64px, 192px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(32px, 256px, 64px, 224px);
- }
-
- .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 32px, 96px, 0px);
- }
- @item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 64px, 96px, 32px);
- }
- @item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(64px, 96px, 96px, 64px);
- }
- @item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(64px, 128px, 96px, 96px);
- }
- @keyfocus@ @itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 160px, 96px, 128px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(64px, 192px, 96px, 160px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(64px, 224px, 96px, 192px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(64px, 256px, 96px, 224px);
- }
-
- .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(96px, 32px, 128px, 0px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(96px, 64px, 128px, 32px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(96px, 96px, 128px, 64px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(96px, 128px, 128px, 96px);
- }
- @keyfocus@ @itemFocused@ .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(96px, 160px, 128px, 128px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(96px, 192px, 128px, 160px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(96px, 224px, 128px, 192px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(96px, 256px, 128px, 224px);
- }
-
- .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 32px, 160px, 0px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 64px, 160px, 32px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 96px, 160px, 64px);
- }
- @item@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 128px, 160px, 96px);
- }
- @keyfocus@ @itemFocused@ .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 160px, 160px, 128px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 192px, 160px, 160px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 224px, 160px, 192px);
- }
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(128px, 256px, 160px, 224px);
- }
-
- #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton {
- list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png");
- }
- #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl@2x.png");
- }
-}
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -63,18 +63,16 @@ browser.jar:
skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png)
skin/classic/browser/customizableui/customize-titleBar-toggle.png (customizableui/customize-titleBar-toggle.png)
skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png (customizableui/customize-titleBar-toggle@2x.png)
skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png)
skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png)
skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
- skin/classic/browser/downloads/buttons.png (downloads/buttons.png)
- skin/classic/browser/downloads/buttons@2x.png (downloads/buttons@2x.png)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
skin/classic/browser/downloads/download-glow-menuPanel@2x.png (downloads/download-glow-menuPanel@2x.png)
skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
skin/classic/browser/downloads/download-notification-finish@2x.png (downloads/download-notification-finish@2x.png)
skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
skin/classic/browser/downloads/download-notification-start@2x.png (downloads/download-notification-start@2x.png)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
--- a/browser/themes/shared/downloads/allDownloadsViewOverlay.inc.css
+++ b/browser/themes/shared/downloads/allDownloadsViewOverlay.inc.css
@@ -84,10 +84,70 @@
-moz-appearance: none;
-moz-box-align: center;
background: transparent;
min-width: 0;
min-height: 0;
margin: 3px;
border: none;
padding: 5px;
- list-style-image: url("chrome://browser/skin/downloads/buttons.png");
+ color: inherit;
+}
+
+.downloadButton > .button-box {
+ -moz-appearance: none;
+ padding: 2px !important;
+ border-radius: 50%;
+ color: graytext;
+}
+
+.downloadButton > .button-box > .button-icon {
+ width: 16px;
+ height: 16px;
+ margin: 0;
+ filter: url("chrome://browser/skin/filters.svg#fill");
+ fill: currentColor;
+}
+
+.downloadButton > .button-box > .button-text {
+ display: none;
+}
+
+.downloadButton:hover > .button-box {
+ background-color: graytext;
+ color: -moz-field;
+}
+
+.downloadButton:hover:active > .button-box {
+ background-color: -moz-fieldtext;
}
+
+@itemFocused@ > .downloadButtonArea > .downloadButton > .button-box {
+ color: inherit;
+}
+
+@itemFocused@ > .downloadButtonArea > .downloadButton:hover > .button-box {
+ background-color: HighlightText;
+ color: Highlight;
+}
+
+@itemFocused@ > .downloadButtonArea > .downloadButton:hover:active > .button-box {
+ background-color: -moz-field;
+ color: -moz-fieldtext;
+}
+
+/*** Button icons ***/
+
+.downloadIconCancel > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel");
+}
+
+.downloadIconShow > .button-box > .button-icon {
+%ifdef XP_MACOSX
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#magnifier");
+%else
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#folder");
+%endif
+}
+
+.downloadIconRetry > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#retry");
+}
--- a/browser/themes/shared/downloads/downloads.inc.css
+++ b/browser/themes/shared/downloads/downloads.inc.css
@@ -255,17 +255,30 @@ richlistitem[type="download"] > .downloa
.downloadButton {
-moz-appearance: none;
min-width: 58px;
margin: 0;
border: none;
background: transparent;
padding: 8px;
- list-style-image: url("chrome://browser/skin/downloads/buttons.png");
+ color: graytext;
+}
+
+.downloadButton > .button-box > .button-icon {
+ width: 16px;
+ height: 16px;
+ margin: 1px;
+ filter: url("chrome://browser/skin/filters.svg#fill");
+ fill: currentColor;
+}
+
+.downloadButton > .button-box > .button-text {
+ margin: 0 !important;
+ padding: 0;
}
@itemFinished@[exists]:hover > .downloadMainArea,
@item@:not([verdict]):hover > .downloadButtonArea {
background-color: var(--arrowpanel-dimmed);
}
@itemFinished@[exists] .downloadMainArea:hover,
@@ -289,32 +302,66 @@ richlistitem[type="download"] > .downloa
@item@[verdict="Malware"]:hover,
@item@[verdict="Malware"]:hover:active,
@item@[verdict="Malware"][showingsubview] {
background-color: #aa1b08;
color: white;
}
+@item@[verdict="Malware"]:hover > .downloadButtonArea > .downloadButton {
+ color: inherit;
+}
+
+/*** Button icons ***/
+
+.downloadIconCancel > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel");
+}
+
+.downloadIconShow > .button-box > .button-icon {
+%ifdef XP_MACOSX
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#magnifier");
+%else
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#folder");
+%endif
+}
+
+.downloadIconRetry > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#retry");
+}
+
+.downloadShowBlockedInfo > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right");
+}
+
+.downloadShowBlockedInfo > .button-box > .button-icon:-moz-locale-dir(rtl) {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left");
+}
+
/*** Blocked subview ***/
#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype=main] > .panel-subviews {
/* When the main view is showing, the shadow on the left edge of the subview is
barely visible on the right edge of the main view, so set it to none. */
box-shadow: none;
}
/* When the subview is showing, turn the download button into an arrow pointing
back to the main view. */
#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton {
- list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png");
+ color: HighlightText;
}
-#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png");
+#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left");
+}
+
+#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon:-moz-locale-dir(rtl) {
+ list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right");
}
#downloadsPanel-blockedSubview {
background-image: url("chrome://browser/skin/warning.svg");
background-size: 32px 32px;
background-position: 16px 16px;
background-repeat: no-repeat;
}
--- a/browser/themes/shared/panel-icons.svg
+++ b/browser/themes/shared/panel-icons.svg
@@ -1,8 +1,18 @@
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg"
width="32" height="32" viewBox="0 0 32 32">
+ <style>
+ path:not(:target) {
+ display: none;
+ }
+ </style>
<path id="cancel" d="m 6,9.5 6.5,6.5 -6.5,6.5 3.5,3.5 6.5,-6.5 6.5,6.5 3.5,-3.5 -6.5,-6.5 6.5,-6.5 -3.5,-3.5 -6.5,6.5 -6.5,-6.5 z" />
+ <path id="folder" d="M17.3,9.4c0,0,1.1,0,3.7,0c1.7,0,2,0,5.6,0c0.6,0,0.6,0,1.1,0V9.2c0-1.5-0.9-2.6-2-2.6h-5.8V6.3c0-0.6-1.5-2-2.8-2h-7.1 H7.6H4.9v2.4v2.4v2.2c2.8,0,8.5,0,8.5,0C16.4,11.3,17.3,9.4,17.3,9.4z M29,13c0-0.6-0.6-1.1-1.5-1.7l0,0c-0.2,0-0.6,0-0.9,0 c-2.8,0-3,0-4.8,0c-1.9,0-3.3,0-3.3,0s-1.5,2.4-3.7,2.4c0,0-6.5,0-9.1,0H5.4C3,13.7,3,15.9,3,15.9l1.1,9.7C4.1,27.1,5,28,6.5,28 h19.1c1.5,0,2.4-0.9,2.4-2.4L29,13.7l0,0l0,0C29,13.7,29,13,29,13z" />
+ <path id="magnifier" d="M12.9,2c6,0,11,5,11,11c0,2.2-0.6,4.2-1.8,6l7.2,7c0.8,0.8,0.8,2.4,0,3.2c-0.6,0.6-1.2,0.8-1.6,0.8s-1.2-0.2-1.6-0.6l-7-7 c-1.8,1.2-3.8,1.8-6,1.8c-6,0-11-5-11-11C2.1,7.2,6.9,2,12.9,2z M12.9,20c3.8,0,7-3.2,7-7s-3.2-7-7-7s-7,3.2-7,7S9.1,20,12.9,20z" />
+ <path id="retry" d="M28,16.5v-14l-5,4.8c-1.8-1.4-4.4-2.4-7-2.4c-6.4,0-11.8,5.2-11.8,11.8c0,6.4,5.2,11.8,11.8,11.8c3.4,0,6.2-1.4,8.2-3.6 l-3.4-3.4c-1.2,1.2-3,1.8-5,1.8c-3.6,0.2-6.8-2.8-6.8-6.8c0-3.8,3-7.2,7-7.2c1.4,0,2.6,0.4,3.6,1l-6,6.2H28z"/>
+ <path id="arrow-left" d="M23.5,25l-9-9l9-9l-3-3l-12,12l12,12L23.5,25z" />
+ <path id="arrow-right" d="M11.6,28l12-12l-12-12l-3,3l9,9l-9,9L11.6,28z" />
</svg>
--- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css
@@ -36,90 +36,8 @@
background-clip: content-box;
border-radius: 6px;
outline: 1px solid rgb(124,163,206);
-moz-outline-radius: 3px;
outline-offset: -2px;
}
}
}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@item@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@item@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@item@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-@media (-moz-os-version: windows-xp) {
- @itemFocused@ .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 80px, 16px, 64px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 96px, 16px, 80px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 112px, 16px, 96px);
- }
- @itemFocused@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 128px, 16px, 112px);
- }
-
- @itemFocused@ .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 80px, 32px, 64px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
- }
- @itemFocused@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
- }
-
- @itemFocused@ .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 80px, 48px, 64px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 96px, 48px, 80px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 112px, 48px, 96px);
- }
- @itemFocused@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 128px, 48px, 112px);
- }
-}
deleted file mode 100644
index b8a97d3750ab5220f53134acab45f6fb6c88c911..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9611a8f8ca8e3c13cff5d2b92137f8a9fc1a9faf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/downloads/downloads.css
+++ b/browser/themes/windows/downloads/downloads.css
@@ -80,95 +80,8 @@
}
/*** Highlighted list items ***/
@keyfocus@ @itemFocused@ {
outline: 1px -moz-dialogtext dotted;
outline-offset: -1px;
}
-
-/*** Button icons ***/
-
-.downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-@item@:hover .downloadButton.downloadIconCancel {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-@item@:hover .downloadButton.downloadIconCancel:hover {
- -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-@item@:hover .downloadButton.downloadIconCancel:active {
- -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-@item@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-@item@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-@item@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-@media (-moz-os-version: windows-xp) {
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
- }
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
- }
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
- -moz-image-region: rect(16px, 112px, 32px, 96px);
- }
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
- -moz-image-region: rect(16px, 128px, 32px, 112px);
- }
-}
-
-.downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-@item@:hover .downloadButton.downloadIconRetry {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-@item@:hover .downloadButton.downloadIconRetry:hover {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-@item@:hover .downloadButton.downloadIconRetry:active {
- -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-.downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 16px, 64px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo {
- -moz-image-region: rect(48px, 32px, 64px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover {
- -moz-image-region: rect(48px, 48px, 64px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active {
- -moz-image-region: rect(48px, 64px, 64px, 48px);
-}
-
-.downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 16px, 80px, 0px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 32px, 80px, 16px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 48px, 80px, 32px);
-}
-@item@:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) {
- -moz-image-region: rect(64px, 64px, 80px, 48px);
-}
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -72,18 +72,16 @@ browser.jar:
skin/classic/browser/customizableui/customize-titleBar-toggle.png (customizableui/customize-titleBar-toggle.png)
skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png (customizableui/customize-titleBar-toggle@2x.png)
skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png)
skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png)
skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png)
skin/classic/browser/customizableui/menu-arrow.svg (customizableui/menu-arrow.svg)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
- skin/classic/browser/downloads/buttons.png (downloads/buttons.png)
- skin/classic/browser/downloads/buttons-XP.png (downloads/buttons-XP.png)
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-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)
@@ -209,17 +207,16 @@ browser.jar:
% 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/downloads/buttons.png chrome://browser/skin/downloads/buttons-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