Bug 744964 - Plugin click-to-play popup notification icon should use the plugin icon, not the add-on icon. r=felipe

This commit is contained in:
Jared Wein 2012-04-13 15:01:43 -07:00
parent f8de31eda6
commit 0e2a1017e8
6 changed files with 37 additions and 8 deletions

View File

@ -441,7 +441,8 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
#notification-popup-box[anchorid="indexedDB-notification-icon"] > #indexedDB-notification-icon,
#notification-popup-box[anchorid="addons-notification-icon"] > #addons-notification-icon,
#notification-popup-box[anchorid="password-notification-icon"] > #password-notification-icon,
#notification-popup-box[anchorid="webapps-notification-icon"] > #webapps-notification-icon {
#notification-popup-box[anchorid="webapps-notification-icon"] > #webapps-notification-icon,
#notification-popup-box[anchorid="plugins-notification-icon"] > #plugins-notification-icon {
display: -moz-box;
}

View File

@ -7285,7 +7285,7 @@ var gPluginHandler = {
};
let options = { dismissed: true };
PopupNotifications.show(aBrowser, "click-to-play-plugins",
messageString, "addons-notification-icon",
messageString, "plugins-notification-icon",
action, null, options);
},

View File

@ -529,6 +529,7 @@
<image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
<image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
<image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
<image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
</box>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events.

View File

@ -1191,13 +1191,18 @@ toolbar[iconsize="small"] #feed-button {
.popup-notification-icon[popupid="addon-install-cancelled"],
.popup-notification-icon[popupid="addon-install-blocked"],
.popup-notification-icon[popupid="addon-install-failed"],
.popup-notification-icon[popupid="addon-install-complete"],
.popup-notification-icon[popupid="click-to-play-plugins"] {
.popup-notification-icon[popupid="addon-install-complete"] {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
width: 32px;
height: 32px;
}
.popup-notification-icon[popupid="click-to-play-plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
width: 32px;
height: 32px;
}
.addon-progress-description {
width: 350px;
max-width: 350px;
@ -1293,6 +1298,10 @@ toolbar[iconsize="small"] #feed-button {
list-style-image: url(chrome://browser/skin/webapps-16.png);
}
#plugins-notification-icon {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-16.png);
}
#treecolAutoCompleteImage {
max-width : 36px;
}

View File

@ -2363,6 +2363,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
list-style-image: url(chrome://browser/skin/webapps-16.png);
}
#plugins-notification-icon {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-16.png);
}
.popup-notification-icon {
width: 64px;
height: 64px;
@ -2378,13 +2382,18 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
.popup-notification-icon[popupid="addon-install-cancelled"],
.popup-notification-icon[popupid="addon-install-blocked"],
.popup-notification-icon[popupid="addon-install-failed"],
.popup-notification-icon[popupid="addon-install-complete"],
.popup-notification-icon[popupid="click-to-play-plugins"] {
.popup-notification-icon[popupid="addon-install-complete"] {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
width: 32px;
height: 32px;
}
.popup-notification-icon[popupid="click-to-play-plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
width: 32px;
height: 32px;
}
.addon-progress-description {
width: 350px;
max-width: 350px;

View File

@ -2249,13 +2249,18 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
.popup-notification-icon[popupid="addon-install-cancelled"],
.popup-notification-icon[popupid="addon-install-blocked"],
.popup-notification-icon[popupid="addon-install-failed"],
.popup-notification-icon[popupid="addon-install-complete"],
.popup-notification-icon[popupid="click-to-play-plugins"] {
.popup-notification-icon[popupid="addon-install-complete"] {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
width: 32px;
height: 32px;
}
.popup-notification-icon[popupid="click-to-play-plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
width: 32px;
height: 32px;
}
.addon-progress-description {
width: 350px;
max-width: 350px;
@ -2357,6 +2362,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
list-style-image: url(chrome://browser/skin/webapps-16.png);
}
#plugins-notification-icon {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-16.png);
}
#identity-popup-container {
min-width: 280px;
}