Bug 1043805 - Added red shield when protection is disabled in blocked content doorhanger. r=Unfocused

This commit is contained in:
Alex Bardas 2014-09-11 15:13:00 +02:00
parent 0a064fee2a
commit f60e558849
11 changed files with 27 additions and 1 deletions

View File

@ -1628,7 +1628,7 @@
<binding id="bad-content-notification" extends="chrome://global/content/bindings/notification.xml#popup-notification">
<content>
<xul:hbox align="start">
<xul:image class="popup-notification-icon" xbl:inherits="popupid"/>
<xul:image class="popup-notification-icon" xbl:inherits="popupid,mixedblockdisabled,trackingblockdisabled"/>
<xul:vbox>
<!-- header -->
<xul:vbox>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -1184,6 +1184,11 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png);
}
.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png);
}
.popup-notification-icon[popupid="webRTC-sharingDevices"],
.popup-notification-icon[popupid="webRTC-shareDevices"] {
list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);

View File

@ -46,6 +46,7 @@ browser.jar:
skin/classic/browser/bad-content-blocked-16.png
skin/classic/browser/bad-content-blocked-64.png
skin/classic/browser/bad-content-unblocked-16.png
skin/classic/browser/bad-content-unblocked-64.png
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/notification-16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -4040,6 +4040,17 @@ menulist.translate-infobar-element > .menulist-dropmarker {
}
}
.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png);
}
@media (min-resolution: 2dppx) {
.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
list-style-image: url(chrome://browser/skin/bad-content-unblocked-64@2x.png);
}
}
.popup-notification-icon[popupid="pointerLock"] {
list-style-image: url(chrome://browser/skin/pointerLock-64.png);
}

View File

@ -72,6 +72,8 @@ browser.jar:
skin/classic/browser/bad-content-blocked-64@2x.png
skin/classic/browser/bad-content-unblocked-16.png
skin/classic/browser/bad-content-unblocked-16@2x.png
skin/classic/browser/bad-content-unblocked-64.png
skin/classic/browser/bad-content-unblocked-64@2x.png
skin/classic/browser/panel-expander-closed.png
skin/classic/browser/panel-expander-closed@2x.png
skin/classic/browser/panel-expander-open.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -2202,6 +2202,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png);
}
.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png);
}
.popup-notification-icon[popupid="webRTC-sharingDevices"],
.popup-notification-icon[popupid="webRTC-shareDevices"] {
list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);

View File

@ -56,6 +56,7 @@ browser.jar:
skin/classic/browser/bad-content-blocked-16.png
skin/classic/browser/bad-content-blocked-64.png
skin/classic/browser/bad-content-unblocked-16.png
skin/classic/browser/bad-content-unblocked-64.png
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/notification-16.png
@ -478,6 +479,7 @@ browser.jar:
skin/classic/aero/browser/bad-content-blocked-16.png
skin/classic/aero/browser/bad-content-blocked-64.png
skin/classic/aero/browser/bad-content-unblocked-16.png
skin/classic/aero/browser/bad-content-unblocked-64.png
skin/classic/aero/browser/monitor.png
skin/classic/aero/browser/monitor_16-10.png
skin/classic/aero/browser/notification-16.png