Bug 851001 - Update global/icons/close[@2x].png for Australis, r=jaws

This commit is contained in:
Mike Conley 2013-06-05 21:39:36 +02:00
parent 29f3fba961
commit 2d0c01141c
27 changed files with 85 additions and 266 deletions

View File

@ -544,7 +544,7 @@
</toolbarbutton>
<toolbarbutton id="tabs-closebutton"
class="close-button tabs-closebutton"
class="close-button tabs-closebutton close-icon"
command="cmd_close"
label="&closeTab.label;"
tooltiptext="&closeTab.label;"/>
@ -1036,7 +1036,7 @@
<sidebarheader id="sidebar-header" align="center">
<label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
<image id="sidebar-throbber"/>
<toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
<toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
</sidebarheader>
<browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
style="min-width: 14em; width: 18em; max-width: 36em;"/>
@ -1134,6 +1134,7 @@
defaultset="addonbar-closebutton,spring,status-bar"
key="key_toggleAddonBar">
<toolbarbutton id="addonbar-closebutton"
class="close-icon"
tooltiptext="&addonBarCloseButton.tooltip;"
oncommand="setToolbarVisibility(this.parentNode, false);"/>
<statusbar id="status-bar" ordinal="1000"/>

View File

@ -31,6 +31,7 @@
label="&newtab.undo.restoreButton;"
class="newtab-undo-button" />
<xul:toolbarbutton id="newtab-undo-close-button" tabindex="-1"
class="close-icon"
tooltiptext="&newtab.undo.closeTooltip;" />
</div>
</div>

View File

@ -83,7 +83,7 @@
<content>
<xul:hbox class="notification-inner outset" flex="1" xbl:inherits="type">
<xul:toolbarbutton ondblclick="event.stopPropagation();"
class="messageCloseButton tabbable"
class="messageCloseButton close-icon tabbable"
xbl:inherits="hidden=hideclose"
tooltiptext="&closeNotification.tooltip;"
oncommand="document.getBindingParent(this).close()"/>

View File

@ -4290,7 +4290,7 @@
role="presentation"/>
<xul:toolbarbutton anonid="close-button"
xbl:inherits="fadein,pinned,selected"
class="tab-close-button"/>
class="tab-close-button close-icon"/>
</xul:hbox>
</xul:stack>
</content>

View File

@ -925,7 +925,7 @@
<xul:menupopup anonid="menupopup"
xbl:inherits="oncommand=menucommand">
<children/>
<xul:menuitem class="menuitem-iconic popup-notification-closeitem"
<xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
label="&closeNotificationItem.label;"
xbl:inherits="oncommand=closeitemcommand"/>
</xul:menupopup>
@ -934,7 +934,7 @@
</xul:vbox>
<xul:vbox pack="start">
<xul:toolbarbutton anonid="closebutton"
class="messageCloseButton popup-notification-closebutton tabbable"
class="messageCloseButton close-icon popup-notification-closebutton tabbable"
xbl:inherits="oncommand=closebuttoncommand"
tooltiptext="&closeNotification.tooltip;"/>
</xul:vbox>
@ -1157,7 +1157,7 @@
<xul:menupopup anonid="menupopup"
xbl:inherits="oncommand=menucommand">
<children/>
<xul:menuitem class="menuitem-iconic popup-notification-closeitem"
<xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
label="&closeNotificationItem.label;"
xbl:inherits="oncommand=closeitemcommand"/>
</xul:menupopup>
@ -1166,7 +1166,7 @@
</xul:vbox>
<xul:vbox pack="start">
<xul:toolbarbutton anonid="closebutton"
class="messageCloseButton popup-notification-closebutton tabbable"
class="messageCloseButton close-icon popup-notification-closebutton tabbable"
xbl:inherits="oncommand=closebuttoncommand"
tooltiptext="&closeNotification.tooltip;"/>
</xul:vbox>
@ -1443,7 +1443,7 @@
<xul:menupopup anonid="menupopup"
xbl:inherits="oncommand=menucommand">
<children/>
<xul:menuitem class="menuitem-iconic popup-notification-closeitem"
<xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
label="&closeNotificationItem.label;"
xbl:inherits="oncommand=closeitemcommand"/>
</xul:menupopup>
@ -1527,7 +1527,7 @@
onclick="document.getBindingParent(this).onLinkClick();"/>
</xul:description>
</xul:hbox>
<xul:toolbarbutton class="panel-promo-closebutton"
<xul:toolbarbutton class="panel-promo-closebutton close-icon"
oncommand="document.getBindingParent(this).onCloseButtonCommand();"
tooltiptext="&closeNotification.tooltip;"/>
</xul:hbox>

View File

@ -2027,40 +2027,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
}
.panel-promo-closebutton {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
border: none;
-moz-margin-end: -14px;
margin-top: -8px;
}
.panel-promo-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.panel-promo-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
.panel-promo-closebutton > .toolbarbutton-text {
padding: 0;
margin: 0;
}
@media (min-resolution: 2dppx) {
.panel-promo-closebutton {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
.panel-promo-closebutton:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
.panel-promo-closebutton:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
.panel-promo-closebutton > .toolbarbutton-icon {
width: 16px;
}
@ -2337,36 +2314,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
}
.tab-close-button {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-appearance: none;
border: none !important;
background: none;
cursor: default;
-moz-image-region: rect(0, 16px, 16px, 0);
}
.tab-close-button:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.tab-close-button:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
@media (min-resolution: 2dppx) {
.tab-close-button {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
.tab-close-button:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
.tab-close-button:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
.tab-close-button > .toolbarbutton-icon {
width: 16px;
}
@ -2626,8 +2580,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
/* Tabstrip close button */
.tabs-closebutton {
-moz-padding-end: 4px;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
border: none;
}
@ -2635,28 +2587,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/icons/close-sidebar.png");
}
.tabs-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.tabs-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
@media (min-resolution: 2dppx) {
:not(#sidebar-header) > .tabs-closebutton {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
:not(#sidebar-header) > .tabs-closebutton:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
:not(#sidebar-header) > .tabs-closebutton:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
:not(#sidebar-header) > .tabs-closebutton > .toolbarbutton-icon {
width: 16px;
}
@ -3215,33 +3146,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
#addonbar-closebutton {
padding: 0;
margin: 0 6px;
list-style-image: url("chrome://global/skin/icons/close.png");
border: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
#addonbar-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
#addonbar-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
@media (min-resolution: 2dppx) {
#addonbar-closebutton {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
#addonbar-closebutton:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
#addonbar-closebutton:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
#addonbar-closebutton > .toolbarbutton-icon {
width: 16px;
}

View File

@ -53,19 +53,9 @@
#newtab-undo-close-button {
padding: 0;
border: none;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
-moz-user-focus: normal;
}
#newtab-undo-close-button:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
#newtab-undo-close-button:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
#newtab-undo-close-button > .toolbarbutton-text {
display: none;
}

View File

@ -1489,21 +1489,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
.panel-promo-closebutton {
-moz-appearance: none;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
border: none;
-moz-margin-end: -10px;
margin-top: -5px;
}
.panel-promo-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.panel-promo-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
.panel-promo-closebutton > .toolbarbutton-text {
padding: 0;
margin: 0;
@ -1612,23 +1602,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
/* Tab close button */
.tab-close-button {
-moz-appearance: none;
-moz-image-region: rect(0, 16px, 16px, 0);
border: none;
list-style-image: url("chrome://global/skin/icons/close.png");
}
.tab-close-button:hover,
.tab-close-button:hover[selected="true"] {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.tab-close-button:hover:active,
.tab-close-button:hover:active[selected="true"] {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
.tab-close-button[selected="true"] {
-moz-image-region: rect(0, 16px, 16px, 0);
}
/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
@ -1732,8 +1706,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
/* Tabstrip close button */
.tabs-closebutton {
-moz-appearance: none;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
padding: 4px 2px;
margin: 0px;
border: none;
@ -1745,14 +1717,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
-moz-padding-start: 2px !important;
}
.tabs-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.tabs-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
}
@ -2207,17 +2171,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
#addonbar-closebutton {
border: none;
padding: 0 5px;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-appearance: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
#addonbar-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
#addonbar-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
/* Status panel */

View File

@ -59,19 +59,9 @@
-moz-appearance: none;
padding: 0;
border: none;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
-moz-user-focus: normal;
}
#newtab-undo-close-button:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
#newtab-undo-close-button:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
#newtab-undo-close-button > .toolbarbutton-text {
display: none;
}

View File

@ -36,7 +36,7 @@
</box>
<vbox class="alertCloseBox">
<toolbarbutton class="alertCloseButton"
<toolbarbutton class="alertCloseButton close-icon"
tooltiptext="&closeAlert.tooltip;"
onclick="event.stopPropagation();"
oncommand="close();"/>

View File

@ -179,7 +179,7 @@
<content hidden="true">
<xul:hbox anonid="findbar-container" class="findbar-container" flex="1" align="center">
<xul:toolbarbutton anonid="find-closebutton"
class="findbar-closebutton"
class="findbar-closebutton close-icon"
tooltiptext="&findCloseButton.tooltip;"
oncommand="close();"/>
<xul:label anonid="find-label" class="findbar-find-fast" control="findbar-textbox"/>

View File

@ -370,7 +370,7 @@
<children/>
</xul:hbox>
<xul:toolbarbutton ondblclick="event.stopPropagation();"
class="messageCloseButton tabbable"
class="messageCloseButton close-icon tabbable"
xbl:inherits="hidden=hideclose"
tooltiptext="&closeNotification.tooltip;"
oncommand="document.getBindingParent(this).close();"/>
@ -474,7 +474,7 @@
<xul:menupopup anonid="menupopup"
xbl:inherits="oncommand=menucommand">
<children/>
<xul:menuitem class="menuitem-iconic popup-notification-closeitem"
<xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
label="&closeNotificationItem.label;"
xbl:inherits="oncommand=closeitemcommand"/>
</xul:menupopup>
@ -483,7 +483,7 @@
</xul:vbox>
<xul:vbox pack="start">
<xul:toolbarbutton anonid="closebutton"
class="messageCloseButton popup-notification-closebutton tabbable"
class="messageCloseButton close-icon popup-notification-closebutton tabbable"
xbl:inherits="oncommand=closebuttoncommand"
tooltiptext="&closeNotification.tooltip;"/>
</xul:vbox>

View File

@ -92,20 +92,9 @@ label {
-moz-appearance: none;
padding: 0;
margin: 2px;
list-style-image: url("chrome://global/skin/icons/close.png");
border: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
.alertCloseButton > .toolbarbutton-text {
display: none;
}
.alertCloseButton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.alertCloseButton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}

View File

@ -46,33 +46,10 @@ label.findbar-find-fast:-moz-lwtheme,
.findbar-closebutton {
padding: 0;
margin: 0 4px;
list-style-image: url("chrome://global/skin/icons/close.png");
border: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
.findbar-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.findbar-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
@media (min-resolution: 2dppx) {
.findbar-closebutton {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
.findbar-closebutton:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
.findbar-closebutton:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
.findbar-closebutton > .toolbarbutton-icon {
width: 16px;
}

View File

@ -336,3 +336,33 @@ notification > button > .button-box > .button-text {
.popup-internal-box > autorepeatbutton[disabled="true"] {
visibility: collapse;
}
/* :::::: Close button icons ::::: */
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
}
.close-icon:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.close-icon:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
@media (min-resolution: 2dppx) {
.close-icon {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
.close-icon:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
.close-icon:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 812 B

View File

@ -65,23 +65,13 @@ notification[type="critical"] {
-moz-appearance: none;
padding: 0;
margin: 0 2px;
list-style-image: url("chrome://global/skin/icons/close.png");
border: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
.messageCloseButton > .toolbarbutton-text {
display: none;
}
.messageCloseButton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.messageCloseButton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
.messageCloseButton:-moz-focusring > .toolbarbutton-icon {
border-radius: 10000px;
box-shadow: 0 0 2px 1px -moz-mac-focusring,
@ -89,19 +79,6 @@ notification[type="critical"] {
}
@media (min-resolution: 2dppx) {
.messageCloseButton {
list-style-image: url("chrome://global/skin/icons/close@2x.png");
-moz-image-region: rect(0, 32px, 32px, 0);
}
.messageCloseButton:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
.messageCloseButton:hover:active {
-moz-image-region: rect(0, 96px, 32px, 64px);
}
.messageCloseButton > .toolbarbutton-icon {
width: 16px;
}

View File

@ -78,9 +78,7 @@ label {
}
.alertCloseButton {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-appearance: none;
-moz-image-region: rect(0, 16px, 16px, 0);
padding: 4px 2px;
border: none !important;
}
@ -88,12 +86,3 @@ label {
.alertCloseButton > .toolbarbutton-text {
display: none;
}
.alertCloseButton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.alertCloseButton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}

View File

@ -7,17 +7,7 @@
.findbar-closebutton {
border: none;
padding: 3px 5px;
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-appearance: none;
-moz-image-region: rect(0, 16px, 16px, 0);
}
.findbar-closebutton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.findbar-closebutton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
findbar {

View File

@ -321,3 +321,38 @@ label[disabled="true"]:-moz-system-metric(windows-classic) {
background-position: left bottom;
%endif
}
/* :::::: Close button icons ::::: */
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
}
.close-icon:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.close-icon:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
%ifdef XP_WIN
@media (-moz-windows-theme: luna-blue) {
.close-icon {
list-style-image: url("chrome://global/skin/icons/close-lunaBlue.png");
}
}
@media (-moz-windows-theme: luna-olive) {
.close-icon {
list-style-image: url("chrome://global/skin/icons/close-lunaOlive.png");
}
}
@media (-moz-windows-theme: luna-silver) {
.close-icon {
list-style-image: url("chrome://global/skin/icons/close-lunaSilver.png");
}
}
%endif

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 901 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1016 B

View File

@ -103,6 +103,9 @@ toolkit.jar:
skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png)
skin/classic/global/icons/Close.gif (icons/Close.gif)
skin/classic/global/icons/close.png (icons/close.png)
skin/classic/global/icons/close-lunaBlue.png (icons/close-lunaBlue.png)
skin/classic/global/icons/close-lunaOlive.png (icons/close-lunaOlive.png)
skin/classic/global/icons/close-lunaSilver.png (icons/close-lunaSilver.png)
skin/classic/global/icons/collapse.png (icons/collapse.png)
skin/classic/global/icons/Error.png (icons/Error.png)
skin/classic/global/icons/error-16.png (icons/error-16.png)

View File

@ -42,21 +42,11 @@ notification[type="critical"] {
}
.messageCloseButton {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-appearance: none;
-moz-image-region: rect(0, 16px, 16px, 0);
padding: 4px 2px;
border: none !important;
}
.messageCloseButton:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
.messageCloseButton:hover:active {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
.messageCloseButton > .toolbarbutton-icon {
-moz-margin-end: 5px;
}
@ -172,8 +162,3 @@ XXX: apply styles to all themes until bug 509642 is fixed
-moz-margin-end: -14px;
margin-top: -10px;
}
.popup-notification-closeitem {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 16px, 16px, 0);
}