Bug 1151412 - Set the default popup notification anchor icon before all popup-specific anchor icons. r=mdeboer

This commit is contained in:
Dão Gottwald 2015-07-20 11:57:00 +02:00
parent a8d577d2ac
commit 344d5d2bcd
3 changed files with 13 additions and 16 deletions

View File

@ -1069,11 +1069,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
outline: 1px dotted -moz-DialogText;
}
.default-notification-icon,
#default-notification-icon {
list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
}
.indexedDB-notification-icon,
#indexedDB-notification-icon {
list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16);

View File

@ -120,16 +120,16 @@
}
.notification-anchor-icon {
%ifdef MOZ_WIDGET_GTK
list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
%else
list-style-image: url(chrome://global/skin/icons/information-16.png);
%endif
width: 16px;
height: 16px;
margin: 0 2px;
}
.default-notification-icon,
#default-notification-icon {
list-style-image: url(chrome://global/skin/icons/information-16.png);
}
.identity-notification-icon,
#identity-notification-icon {
list-style-image: url(chrome://mozapps/skin/profile/profileicon.png);
@ -318,6 +318,14 @@
border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
}
.notification-anchor-icon {
%ifdef MOZ_WIDGET_GTK
list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog);
%else
list-style-image: url(chrome://global/skin/icons/information-32.png);
%endif
}
.webRTC-shareDevices-notification-icon,
#webRTC-shareDevices-notification-icon {
list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png);
@ -365,11 +373,6 @@
%ifdef XP_MACOSX
/* OSX only until we have icons for Windows and Linux */
.default-notification-icon,
#default-notification-icon {
list-style-image: url(chrome://global/skin/icons/information-32.png);
}
.geo-notification-icon,
#geo-notification-icon {
list-style-image: url(chrome://browser/skin/Geolocation-16@2x.png);

View File

@ -770,7 +770,6 @@ PopupNotifications.prototype = {
if (anchorElement.classList.contains("notification-anchor-icon")) {
// remove previous icon classes
let className = anchorElement.className.replace(/([-\w]+-notification-icon\s?)/g,"")
className = "default-notification-icon " + className;
if (notifications.length > 0) {
// Find the first notification this anchor used for.
let notification = notifications[0];