From 1c4c4e9abe604796f621092a3eec97e02a4ee2df Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sun, 8 Nov 2020 22:38:16 +0800
Subject: [PATCH] Fixed firefox theme issue

---
 .../application-x-addon-blocked-symbolic.svg  |  7 ++++++
 .../icons/autoplay-media-blocked-symbolic.svg |  4 ++++
 .../icons/autoplay-media-symbolic.svg         |  3 +++
 .../chrome/WhiteSur/icons/drm-symbolic.svg    | 12 ++++++++++
 .../firefox/chrome/WhiteSur/parts/buttons.css |  4 ++--
 .../firefox/chrome/WhiteSur/parts/icons.css   | 23 ++++++++++++++++++-
 .../chrome/WhiteSur/parts/popups-contents.css |  5 ++--
 7 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 src/other/firefox/chrome/WhiteSur/icons/application-x-addon-blocked-symbolic.svg
 create mode 100644 src/other/firefox/chrome/WhiteSur/icons/autoplay-media-blocked-symbolic.svg
 create mode 100644 src/other/firefox/chrome/WhiteSur/icons/autoplay-media-symbolic.svg
 create mode 100644 src/other/firefox/chrome/WhiteSur/icons/drm-symbolic.svg

diff --git a/src/other/firefox/chrome/WhiteSur/icons/application-x-addon-blocked-symbolic.svg b/src/other/firefox/chrome/WhiteSur/icons/application-x-addon-blocked-symbolic.svg
new file mode 100644
index 0000000..74a645f
--- /dev/null
+++ b/src/other/firefox/chrome/WhiteSur/icons/application-x-addon-blocked-symbolic.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#6e6e6e; } .ColorScheme-Highlight { color:#5294e2; }</style>
+ </defs>
+ <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v3.1543h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h3.1543v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h3.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h3c0.554 0 1 0.446 1 1v3h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h3v-2c0-0.554 0.446-1 1-1z" fill="#363636" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2.2361"/>
+</svg>
diff --git a/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-blocked-symbolic.svg b/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-blocked-symbolic.svg
new file mode 100644
index 0000000..e8ba914
--- /dev/null
+++ b/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-blocked-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" opacity=".35" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636"/>
+</svg>
diff --git a/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-symbolic.svg b/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-symbolic.svg
new file mode 100644
index 0000000..85824fe
--- /dev/null
+++ b/src/other/firefox/chrome/WhiteSur/icons/autoplay-media-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
+</svg>
diff --git a/src/other/firefox/chrome/WhiteSur/icons/drm-symbolic.svg b/src/other/firefox/chrome/WhiteSur/icons/drm-symbolic.svg
new file mode 100644
index 0000000..019bec4
--- /dev/null
+++ b/src/other/firefox/chrome/WhiteSur/icons/drm-symbolic.svg
@@ -0,0 +1,12 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#363636;
+      }</style>
+ </defs>
+ <g transform="translate(-.20339 -.13559)">
+  <path d="m9.6176 6.7214c-0.12118-0.12118-0.25154-0.22665-0.38947-0.31763l-0.73473 0.73473c0.14934 0.07242 0.2917 0.16462 0.41709 0.29001 0.59372 0.59372 0.59372 1.5276 0 2.1213l-2.1213 2.1213c-0.59372 0.59372-1.5276 0.59372-2.1213 0-0.59372-0.59372-0.59372-1.5276 0-2.1213l0.60491-0.60491c-0.13649-0.39092-0.21105-0.79819-0.20578-1.2084l-1.1062 1.1062c-0.97323 0.97323-0.97323 2.5623 0 3.5355 0.97323 0.97323 2.5623 0.97323 3.5355 0l2.1213-2.1213c0.97323-0.97323 0.97323-2.5623 0-3.5355z" style="fill:currentColor" class="ColorScheme-Text"/>
+  <path d="m6.7892 9.5498c0.12118 0.12118 0.25154 0.22665 0.38948 0.31763l0.73473-0.73473c-0.14934-0.07241-0.29166-0.16466-0.41705-0.29006-0.59372-0.59372-0.59372-1.5276 0-2.1213l2.1213-2.1213c0.59372-0.59372 1.5276-0.59372 2.1213 0 0.59372 0.59372 0.59372 1.5276 0 2.1213l-0.60491 0.60491c0.13649 0.39092 0.21105 0.79819 0.20578 1.2084l1.1062-1.1062c0.97323-0.97323 0.97323-2.5623 0-3.5355-0.97323-0.97323-2.5623-0.97323-3.5355 0l-2.1213 2.1213c-0.97323 0.97323-0.97323 2.5623 0 3.5355z" style="fill:currentColor" class="ColorScheme-Text"/>
+ </g>
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" style="fill:currentColor" class="ColorScheme-Text"/>
+</svg>
diff --git a/src/other/firefox/chrome/WhiteSur/parts/buttons.css b/src/other/firefox/chrome/WhiteSur/parts/buttons.css
index 8c45132..71b1f60 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/buttons.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/buttons.css
@@ -254,7 +254,7 @@ menulist[open] .menulist-label-box,
 .subviewbutton.panel-subview-footer:not(:only-of-type):not(:last-of-type),
 .panel-footer button:not(:only-of-type):not(:last-of-type),
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button),
-#context-navigation menuitem:not(:last-of-type),
+#context-navigation menuitem:not(:only-of-type):not(:last-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
 .findbar-button:not(:last-of-type) {
 	border-top-right-radius: 0 !important;
@@ -267,7 +267,7 @@ menulist[open] .menulist-label-box,
 .subviewbutton.panel-subview-footer:not(:only-of-type):not(:first-of-type),
 .panel-footer button:not(:only-of-type):not(:first-of-type),
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button),
-#context-navigation menuitem:not(:first-of-type),
+#context-navigation menuitem:not(:only-of-type):not(:first-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
 .findbar-container toolbarbutton.findbar-find-next,
 .findbar-button:not(:first-of-type) {
diff --git a/src/other/firefox/chrome/WhiteSur/parts/icons.css b/src/other/firefox/chrome/WhiteSur/parts/icons.css
index a377ce2..c9dd4ca 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/icons.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/icons.css
@@ -308,10 +308,30 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	list-style-image: url("../icons/application-x-addon-symbolic.svg") !important;
 }
 
+.plugin-icon {
+	list-style-image: url("../icons/application-x-addon-symbolic.svg") !important;
+}
+
+.plugin-blocked > .plugin-icon {
+	list-style-image: url("../icons/application-x-addon-blocked-symbolic.svg") !important;
+}
+
 /* #plugin-icon-badge {
     list-style-image: url("../icons/application-x-addon-symbolic.svg") !important;
 } */
 
+.autoplay-media-icon {
+	list-style-image: url("../icons/autoplay-media-symbolic.svg") !important;
+}
+
+.autoplay-media-icon.blocked-permission-icon {
+	list-style-image: url("../icons/autoplay-media-blocked-symbolic.svg") !important;
+}
+
+.popup-notification-icon[popupid="drmContentPlaying"], .drm-icon {
+	list-style-image: url("../icons/drm-symbolic.svg") !important;
+}
+
 #reader-mode-button {
 	list-style-image: url("../icons/reader-mode.svg") !important;
 }
@@ -413,7 +433,8 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	#tracking-protection-icon-animatable-image,
 	#reader-mode-button,
 	#star-button:not([starred]),
-	#plugins-notification-icon:not(.plugin-blocked) > .plugin-icon,
+	.plugin-icon, .autoplay-media-icon,
+	.popup-notification-icon[popupid="drmContentPlaying"], .drm-icon,
 	.bookmark-item[container] .toolbarbutton-icon {
 		filter: invert(60%) brightness(150%);
 	}
diff --git a/src/other/firefox/chrome/WhiteSur/parts/popups-contents.css b/src/other/firefox/chrome/WhiteSur/parts/popups-contents.css
index 4cbde3e..b4b7023 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/popups-contents.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/popups-contents.css
@@ -108,7 +108,7 @@
 	margin-top: 10px;
 	z-index: 10;
 }
-#customization-panelWrapper > .panel-arrowbox {    
+#customization-panelWrapper > .panel-arrowbox {
 	margin-bottom: -5px !important;
 }
 
@@ -205,8 +205,9 @@
 	border-radius: 5px 5px 0 0;
 	min-height: 34px !important;
 }
+
 #protections-popup[toast] #protections-popup-mainView-panel-header {
-	border-radius: 5px !important;
+	border-radius: 5px 5px 5px 5px !important;
 }
 
 #protections-popup-message {