--- a/browser/components/downloads/content/download.xml
+++ b/browser/components/downloads/content/download.xml
@@ -42,30 +42,30 @@
min="0"
max="100"
xbl:inherits="mode=progressmode,value=progress"/>
<xul:description class="downloadDetails"
crop="end"
xbl:inherits="value=status,tooltiptext=statusTip"/>
</xul:vbox>
<xul:stack>
- <xul:button class="downloadButton downloadCancel"
+ <xul:button class="downloadButton downloadCancel downloadIconCancel"
tooltiptext="&cmd.cancel.label;"
oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_cancel');"/>
- <xul:button class="downloadButton downloadRetry"
+ <xul:button class="downloadButton downloadRetry downloadIconRetry"
tooltiptext="&cmd.retry.label;"
oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_retry');"/>
- <xul:button class="downloadButton downloadShow"
+ <xul:button class="downloadButton downloadShow downloadIconShow"
#ifdef XP_MACOSX
tooltiptext="&cmd.showMac.label;"
#else
tooltiptext="&cmd.show.label;"
#endif
oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_show');"/>
- <xul:button class="downloadButton downloadConfirmBlock"
+ <xul:button class="downloadButton downloadConfirmBlock downloadIconCancel"
tooltiptext="&cmd.removeFile.label;"
oncommand="DownloadsView.onDownloadCommand(event, 'downloadsCmd_confirmBlock');"/>
</xul:stack>
</content>
</binding>
<binding id="download-toolbarbutton"
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
--- a/browser/themes/linux/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/linux/downloads/allDownloadsViewOverlay.css
@@ -11,90 +11,82 @@
}
.blockedIcon {
list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog");
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-@itemFocused@ .downloadButton.downloadConfirmBlock,
-@itemFocused@ .downloadButton.downloadCancel {
+@itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 80px, 16px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock,
-@itemFocused@:hover .downloadButton.downloadCancel {
+@itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 96px, 16px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
-@itemFocused@:hover .downloadButton.downloadCancel:hover {
+@itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 112px, 16px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
-@itemFocused@:hover .downloadButton.downloadCancel:active {
+@itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 16px, 112px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@item@:hover .downloadButton.downloadShow {
+@item@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
-@item@:hover .downloadButton.downloadShow:hover {
+@item@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-@item@:hover .downloadButton.downloadShow:active {
+@item@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
-@itemFocused@ .downloadButton.downloadShow {
+@itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 80px, 32px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadShow {
+@itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadShow:hover {
+@itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadShow:active {
+@itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}
-@itemFocused@ .downloadButton.downloadRetry {
+@itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 80px, 48px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadRetry {
+@itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 96px, 48px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadRetry:hover {
+@itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 112px, 48px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadRetry:active {
+@itemFocused@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 128px, 48px, 112px);
}
--- a/browser/themes/linux/downloads/downloads.css
+++ b/browser/themes/linux/downloads/downloads.css
@@ -58,50 +58,46 @@
background-color: Highlight;
background-image: linear-gradient(hsla(0,0%,100%,.1), transparent);
color: HighlightText;
cursor: pointer;
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:hover {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:active {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}
--- a/browser/themes/osx/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/osx/downloads/allDownloadsViewOverlay.css
@@ -7,183 +7,167 @@
/*** List items ***/
:root {
--downloads-item-height: 6em;
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-@itemFocused@ .downloadButton.downloadConfirmBlock,
-@itemFocused@ .downloadButton.downloadCancel {
+@itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 80px, 16px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock,
-@itemFocused@:hover .downloadButton.downloadCancel {
+@itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 96px, 16px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
-@itemFocused@:hover .downloadButton.downloadCancel:hover {
+@itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 112px, 16px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
-@itemFocused@:hover .downloadButton.downloadCancel:active {
+@itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 16px, 112px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@item@:hover .downloadButton.downloadShow {
+@item@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
-@item@:hover .downloadButton.downloadShow:hover {
+@item@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-@item@:hover .downloadButton.downloadShow:active {
+@item@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
-@itemFocused@ .downloadButton.downloadShow {
+@itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 80px, 32px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadShow {
+@itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadShow:hover {
+@itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadShow:active {
+@itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}
-@itemFocused@ .downloadButton.downloadRetry {
+@itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 80px, 48px, 64px);
}
-@itemFocused@:hover .downloadButton.downloadRetry {
+@itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 96px, 48px, 80px);
}
-@itemFocused@:hover .downloadButton.downloadRetry:hover {
+@itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 112px, 48px, 96px);
}
-@itemFocused@:hover .downloadButton.downloadRetry:active {
+@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.downloadConfirmBlock,
- .downloadButton.downloadCancel {
+ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 32px, 0px);
}
- @item@:hover .downloadButton.downloadConfirmBlock,
- @item@:hover .downloadButton.downloadCancel {
+ @item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 64px, 32px, 32px);
}
- @item@:hover .downloadButton.downloadConfirmBlock:hover,
- @item@:hover .downloadButton.downloadCancel:hover {
+ @item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 96px, 32px, 64px);
}
- @item@:hover .downloadButton.downloadConfirmBlock:active,
- @item@:hover .downloadButton.downloadCancel:active {
+ @item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 32px, 96px);
}
- @itemFocused@ .downloadButton.downloadConfirmBlock,
- @itemFocused@ .downloadButton.downloadCancel {
+ @itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 160px, 32px, 128px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock,
- @itemFocused@:hover .downloadButton.downloadCancel {
+ @itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 192px, 32px, 160px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
- @itemFocused@:hover .downloadButton.downloadCancel:hover {
+ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 224px, 32px, 192px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
- @itemFocused@:hover .downloadButton.downloadCancel:active {
+ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 256px, 32px, 224px);
}
- .downloadButton.downloadShow {
+ .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 32px, 64px, 0px);
}
- @item@:hover .downloadButton.downloadShow {
+ @item@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 64px, 64px, 32px);
}
- @item@:hover .downloadButton.downloadShow:hover {
+ @item@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(32px, 96px, 64px, 64px);
}
- @item@:hover .downloadButton.downloadShow:active {
+ @item@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(32px, 128px, 64px, 96px);
}
- @itemFocused@ .downloadButton.downloadShow {
+ @itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 160px, 64px, 128px);
}
- @itemFocused@:hover .downloadButton.downloadShow {
+ @itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 192px, 64px, 160px);
}
- @itemFocused@:hover .downloadButton.downloadShow:hover {
+ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(32px, 224px, 64px, 192px);
}
- @itemFocused@:hover .downloadButton.downloadShow:active {
+ @itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(32px, 256px, 64px, 224px);
}
- .downloadButton.downloadRetry {
+ .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 32px, 96px, 0px);
}
- @item@:hover .downloadButton.downloadRetry {
+ @item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 64px, 96px, 32px);
}
- @item@:hover .downloadButton.downloadRetry:hover {
+ @item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(64px, 96px, 96px, 64px);
}
- @item@:hover .downloadButton.downloadRetry:active {
+ @item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(64px, 128px, 96px, 96px);
}
- @itemFocused@ .downloadButton.downloadRetry {
+ @itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 160px, 96px, 128px);
}
- @itemFocused@:hover .downloadButton.downloadRetry {
+ @itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 192px, 96px, 160px);
}
- @itemFocused@:hover .downloadButton.downloadRetry:hover {
+ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(64px, 224px, 96px, 192px);
}
- @itemFocused@:hover .downloadButton.downloadRetry:active {
+ @itemFocused@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(64px, 256px, 96px, 224px);
}
}
--- a/browser/themes/osx/downloads/downloads.css
+++ b/browser/themes/osx/downloads/downloads.css
@@ -59,189 +59,173 @@
}
@notKeyfocus@ @itemFinished@[exists]:hover {
cursor: pointer;
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-@keyfocus@ @itemFocused@ .downloadButton.downloadConfirmBlock,
-@keyfocus@ @itemFocused@ .downloadButton.downloadCancel {
+@keyfocus@ @itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 80px, 16px, 64px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel {
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 96px, 16px, 80px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel:hover {
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 112px, 16px, 96px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel:active {
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 16px, 112px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow {
+@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow:hover {
+@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow:active {
+@keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
-@keyfocus@ @itemFocused@ .downloadButton.downloadShow {
+@keyfocus@ @itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 80px, 32px, 64px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShow {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow,
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:hover,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShow:hover {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover,
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
-@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:active,
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadShow:active {
+@notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active,
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}
-@keyfocus@ @itemFocused@ .downloadButton.downloadRetry {
+@keyfocus@ @itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 80px, 48px, 64px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry {
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 96px, 48px, 80px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry:hover {
+@keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 112px, 48px, 96px);
}
-@keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry:active {
+@keyfocus@ @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.downloadConfirmBlock,
- .downloadButton.downloadCancel {
+ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 32px, 0px);
}
- @item@:hover .downloadButton.downloadConfirmBlock,
- @item@:hover .downloadButton.downloadCancel {
+ @item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 64px, 32px, 32px);
}
- @item@:hover .downloadButton.downloadConfirmBlock:hover,
- @item@:hover .downloadButton.downloadCancel:hover {
+ @item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 96px, 32px, 64px);
}
- @item@:hover .downloadButton.downloadConfirmBlock:active,
- @item@:hover .downloadButton.downloadCancel:active {
+ @item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 32px, 96px);
}
- @keyfocus@ @itemFocused@ .downloadButton.downloadConfirmBlock,
- @keyfocus@ @itemFocused@ .downloadButton.downloadCancel {
+ @keyfocus@ @itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 160px, 32px, 128px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 192px, 32px, 160px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel:hover {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 224px, 32px, 192px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadCancel:active {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 256px, 32px, 224px);
}
- .downloadButton.downloadShow {
+ .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 32px, 64px, 0px);
}
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow {
+ @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 64px, 64px, 32px);
}
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow:hover {
+ @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(32px, 96px, 64px, 64px);
}
- @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadShow:active {
+ @keyfocus@ @itemFinished@:hover:not([selected]) .downloadButton.downloadIconShow:active {
-moz-image-region: rect(32px, 128px, 64px, 96px);
}
- @keyfocus@ @itemFocused@ .downloadButton.downloadShow {
+ @keyfocus@ @itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 160px, 64px, 128px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShow {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow,
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(32px, 192px, 64px, 160px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:hover,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShow:hover {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover,
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(32px, 224px, 64px, 192px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:active,
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadShow:active {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active,
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(32px, 256px, 64px, 224px);
}
- .downloadButton.downloadRetry {
+ .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 32px, 96px, 0px);
}
- @item@:hover .downloadButton.downloadRetry {
+ @item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 64px, 96px, 32px);
}
- @item@:hover .downloadButton.downloadRetry:hover {
+ @item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(64px, 96px, 96px, 64px);
}
- @item@:hover .downloadButton.downloadRetry:active {
+ @item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(64px, 128px, 96px, 96px);
}
- @keyfocus@ @itemFocused@ .downloadButton.downloadRetry {
+ @keyfocus@ @itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 160px, 96px, 128px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(64px, 192px, 96px, 160px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry:hover {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(64px, 224px, 96px, 192px);
}
- @keyfocus@ @itemFocused@:hover .downloadButton.downloadRetry:active {
+ @keyfocus@ @itemFocused@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(64px, 256px, 96px, 224px);
}
}
--- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css
@@ -39,95 +39,87 @@
-moz-outline-radius: 3px;
outline-offset: -2px;
}
}
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@item@:hover .downloadButton.downloadShow {
+@item@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
-@item@:hover .downloadButton.downloadShow:hover {
+@item@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-@item@:hover .downloadButton.downloadShow:active {
+@item@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}
@media (-moz-os-version: windows-xp) {
- @itemFocused@ .downloadButton.downloadConfirmBlock,
- @itemFocused@ .downloadButton.downloadCancel {
+ @itemFocused@ .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 80px, 16px, 64px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock,
- @itemFocused@:hover .downloadButton.downloadCancel {
+ @itemFocused@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 96px, 16px, 80px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock:hover,
- @itemFocused@:hover .downloadButton.downloadCancel:hover {
+ @itemFocused@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 112px, 16px, 96px);
}
- @itemFocused@:hover .downloadButton.downloadConfirmBlock:active,
- @itemFocused@:hover .downloadButton.downloadCancel:active {
+ @itemFocused@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 128px, 16px, 112px);
}
- @itemFocused@ .downloadButton.downloadShow {
+ @itemFocused@ .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 80px, 32px, 64px);
}
- @itemFocused@:hover .downloadButton.downloadShow {
+ @itemFocused@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
- @itemFocused@:hover .downloadButton.downloadShow:hover {
+ @itemFocused@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
- @itemFocused@:hover .downloadButton.downloadShow:active {
+ @itemFocused@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
- @itemFocused@ .downloadButton.downloadRetry {
+ @itemFocused@ .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 80px, 48px, 64px);
}
- @itemFocused@:hover .downloadButton.downloadRetry {
+ @itemFocused@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 96px, 48px, 80px);
}
- @itemFocused@:hover .downloadButton.downloadRetry:hover {
+ @itemFocused@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 112px, 48px, 96px);
}
- @itemFocused@:hover .downloadButton.downloadRetry:active {
+ @itemFocused@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 128px, 48px, 112px);
}
}
--- a/browser/themes/windows/downloads/downloads.css
+++ b/browser/themes/windows/downloads/downloads.css
@@ -143,70 +143,66 @@
0 1px 0 hsla(0,0%,100%,.3) inset;
background-image: linear-gradient(hsl(212,86%,92%), hsl(212,91%,86%));
color: black;
}
}
/*** Button icons ***/
-.downloadButton.downloadConfirmBlock,
-.downloadButton.downloadCancel {
+.downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
-@item@:hover .downloadButton.downloadConfirmBlock,
-@item@:hover .downloadButton.downloadCancel {
+@item@:hover .downloadButton.downloadIconCancel {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:hover,
-@item@:hover .downloadButton.downloadCancel:hover {
+@item@:hover .downloadButton.downloadIconCancel:hover {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
-@item@:hover .downloadButton.downloadConfirmBlock:active,
-@item@:hover .downloadButton.downloadCancel:active {
+@item@:hover .downloadButton.downloadIconCancel:active {
-moz-image-region: rect(0px, 64px, 16px, 48px);
}
-.downloadButton.downloadShow {
+.downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 16px, 32px, 0px);
}
-@item@:hover .downloadButton.downloadShow {
+@item@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
-@item@:hover .downloadButton.downloadShow:hover {
+@item@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-@item@:hover .downloadButton.downloadShow:active {
+@item@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
@media (-moz-os-version: windows-xp) {
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadShow {
+ @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadShow:hover {
+ @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
- @keyfocus@ @itemFinished@:hover .downloadButton.downloadShow:active {
+ @keyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 64px, 32px, 48px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow {
-moz-image-region: rect(16px, 96px, 32px, 80px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:hover {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:hover {
-moz-image-region: rect(16px, 112px, 32px, 96px);
}
- @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadShow:active {
+ @notKeyfocus@ @itemFinished@:hover .downloadButton.downloadIconShow:active {
-moz-image-region: rect(16px, 128px, 32px, 112px);
}
}
-.downloadButton.downloadRetry {
+.downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 16px, 48px, 0px);
}
-@item@:hover .downloadButton.downloadRetry {
+@item@:hover .downloadButton.downloadIconRetry {
-moz-image-region: rect(32px, 32px, 48px, 16px);
}
-@item@:hover .downloadButton.downloadRetry:hover {
+@item@:hover .downloadButton.downloadIconRetry:hover {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
-@item@:hover .downloadButton.downloadRetry:active {
+@item@:hover .downloadButton.downloadIconRetry:active {
-moz-image-region: rect(32px, 64px, 48px, 48px);
}