From c066e7430797513cede96b4817b590d07056a62f Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 22 Sep 2014 03:24:00 +0200
Subject: [PATCH] take in fixes for bug 1043797, bug 1043803, and bug 1043805
 to make content blocking notifications work in 34 and newer

---
 ...cked-16.png => bad-content-blocked-16.png} | Bin
 ...cked-64.png => bad-content-blocked-64.png} | Bin
 .../browser/bad-content-unblocked-16.png      | Bin 0 -> 218 bytes
 .../browser/bad-content-unblocked-64.png      | Bin 0 -> 458 bytes
 LCARStrek/browser/browser.css                 |  42 ++++++++++++++++--
 5 files changed, 38 insertions(+), 4 deletions(-)
 rename LCARStrek/browser/{mixed-content-blocked-16.png => bad-content-blocked-16.png} (100%)
 rename LCARStrek/browser/{mixed-content-blocked-64.png => bad-content-blocked-64.png} (100%)
 create mode 100644 LCARStrek/browser/bad-content-unblocked-16.png
 create mode 100644 LCARStrek/browser/bad-content-unblocked-64.png

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
index 0000000000000000000000000000000000000000..51bbf4ab79d5b80fa255de50977afa8feb07b443
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$63nonX&%nU8p+W{I
z$XF8O7tG-B>_!@hljQC0!qCAg>j6?;;1OBOz`!jG!i)^F=12eq*-JcqUD@w(iZP06
z75e?K01A0|x;Tb#Tu)A5V0L3yP?TD9;DE$|O-+qcCuTA-cWZ<*Pq-kIkRTc<c;JA>
zmIIBA6IU~OWEe7pu4l+fj5=`Yz=5k$hYlQIF=OCh$jssl3umZ$0yLGu)78&qol`;+
E062C!#Q*>R

literal 0
HcmV?d00001

diff --git a/LCARStrek/browser/bad-content-unblocked-64.png b/LCARStrek/browser/bad-content-unblocked-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c54cae10b6d65466ec02df978ca92da0e603330
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_%$6{}~t-OqfvEP!b6g
zWGo5t3ubV5b|VeMN%D4gVd!9$^#Ca^@Q5sCVBi)8VMc~ob0mO*>?NMQuI%?X#TbR;
z<af{V0_w5yba4!^IK6eUb>3kE0hdgstcaz7^Nk*8_DosTbD&z@GS$y<iPE<zGyeue
zEi*|l6PlmqeuqD}s><;E?^Aak+ZkW8<5uhBTC_y!#Y-bjg~)YWT{WVi(fM_3hAf#S
z@`AhV<Xq$~28*6d;>!5mGx_<xOJ{WyCWPGUT*sy$P+-XIxkam>`$+7+=IK-S@oY(I
z$S4jFJ+P>XL%V_1pFxZ*Yr8<i7mg!IOdDn}3Q0DIDhT#D2+eFz5o)}4$T3k@J?r3E
z$B#vB3$}6`I91sozxf2?3RjjaLx*Sin@`vYFk}ffnto;3e{Et>Lz=9l!bwdt*5nNN
zYZHYl++Q)s-<wz*)M*!~H0%A+IaWc*MTv>d=1K_{Rg@xf)=Vyq3Xz>v5_N(@_P@t1
uLB8@FM_n(01CRf!UWwYmaPQLU>++pfFJA~_3tI*ZSO!m5KbLh*2~7a%9-?gk

literal 0
HcmV?d00001

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 49339400..987b42e1 100644
--- 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 */
-- 
2.35.3