take in fixes for bug 1043797, bug 1043803, and bug 1043805 to make content blocking...

diff --git a/LCARStrek/browser/mixed-content-blocked-16.png b/LCARStrek/browser/bad-content-blocked-16.png
similarity index 100%
rename from LCARStrek/browser/mixed-content-blocked-16.png
rename to LCARStrek/browser/bad-content-blocked-16.png

diff --git a/LCARStrek/browser/mixed-content-blocked-64.png b/LCARStrek/browser/bad-content-blocked-64.png
similarity index 100%
rename from LCARStrek/browser/mixed-content-blocked-64.png
rename to LCARStrek/browser/bad-content-blocked-64.png

diff --git a/LCARStrek/browser/bad-content-unblocked-16.png b/LCARStrek/browser/bad-content-unblocked-16.png
new file mode 100644 (file)
index 0000000..51bbf4a
Binary files /dev/null and b/LCARStrek/browser/bad-content-unblocked-16.png differ

diff --git a/LCARStrek/browser/bad-content-unblocked-64.png b/LCARStrek/browser/bad-content-unblocked-64.png
new file mode 100644 (file)
index 0000000..7c54cae
Binary files /dev/null and b/LCARStrek/browser/bad-content-unblocked-64.png differ

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 493394008cfcc8d3cfd1ae6657647f33b6a029f6..987b42e1dcb287d124e989ca93bb06f5dd484d02 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -3009,8 +3009,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
-.popup-notification-icon[popupid="mixed-content-blocked"] {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png");
+.popup-notification-icon[popupid="mixed-content-blocked"],
+.popup-notification-icon[popupid="bad-content"] {
+  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"],
@@ -3140,8 +3146,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 }
 
 .mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
+#mixed-content-blocked-notification-icon,
+.bad-content-blocked-notification-icon,
+#bad-content-blocked-notification-icon {
+  list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png");
+}
+
+.bad-content-unblocked-notification-icon,
+#bad-content-unblocked-notification-icon {
+  list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png);
 }
 
 .webRTC-shareDevices-notification-icon,
@@ -4487,6 +4500,27 @@ notification.pluginVulnerable .messageImage {
 
 /* === END plugin-doorhanger.inc.css === */
 
+/* === BEGIN badcontent-doorhanger.inc.css === */
+
+.popup-notification-item-title[popupid="bad-content"] {
+  font-weight: bold;
+}
+
+.popup-notification-item-message[popupid="bad-content"] {
+  width: 17em;
+}
+
+.popup-notification-item-message-critical[popupid="bad-content"] {
+  color: #FF0000;
+  font-style: italic;
+}
+
+.popup-notification-footer[popupid="bad-content"] {
+  padding-top: 1em;
+}
+
+/* === END badcontent-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */