From 650553a8861bcecbd903098990847b794459e543 Mon Sep 17 00:00:00 2001
From: bmFtZQ <62812711+bmFtZQ@users.noreply.github.com>
Date: Wed, 5 May 2021 23:39:25 +0800
Subject: [PATCH] fix downloads icon + modified audio icons

---
 chrome/icons/audio-muted.svg   | 10 +++-----
 chrome/icons/audio.svg         | 10 +++-----
 chrome/icons/icons.css         | 45 ++++++++++++++++++----------------
 chrome/icons/media-blocked.svg |  6 ++---
 4 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/chrome/icons/audio-muted.svg b/chrome/icons/audio-muted.svg
index fadc010..d209a25 100644
--- a/chrome/icons/audio-muted.svg
+++ b/chrome/icons/audio-muted.svg
@@ -1,9 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <style>
-        :root &gt; #overlayStroke:not(:target) {
-            display: none;
-        }
-    </style>
-    <path id="overlayStroke" style="fill:context-stroke;fill-opacity:context-stroke-opacity; stroke-width:0" d="M8.234 1.143a1.884 1.884 0 0 0-1.517.646 1 1 0 0 0-.008.01L4.855 4H3.486A2.507 2.507 0 0 0 .992 6.508l.016 3a1 1 0 0 0 0 .004A2.529 2.529 0 0 0 3.508 12a1 1 0 0 0 .006 0h1.252l1.947 2.232a1 1 0 0 0 .008.008c.511.572 1.328.78 2.05.52a1 1 0 0 0 .024-.01A1.897 1.897 0 0 0 10 13.016 1 1 0 0 0 10 13v-1.857c.47.084.954.024 1.31-.332l.69-.69.69.69a1.516 1.516 0 0 0 2.12.002v-.002h.002a1.516 1.516 0 0 0-.001-2.122v-.002L14.12 8l.69-.688v-.001a1.515 1.515 0 0 0 0-2.122 1.5 1.5 0 0 0-2.122 0L12 5.88l-.69-.69a1.471 1.471 0 0 0-1.119-.439c-.07.003-.121.07-.191.084V3c0-.835-.51-1.49-1.225-1.752a1 1 0 0 0-.005-.002 1.833 1.833 0 0 0-.536-.103zM7 6.11v3.887l-.422-.484a1 1 0 0 0-.002 0A1.502 1.502 0 0 0 5.446 9h-1.44l-.012-2h1.559A1.5 1.5 0 0 0 6.7 6.467L7 6.11z"/>
-    <path style="fill:context-fill;fill-opacity:context-fill-opacity" d="M8.186 2.139a.882.882 0 0 0-.713.304L5.32 5H3.486c-.822 0-1.498.68-1.494 1.502l.016 3A1.514 1.514 0 0 0 3.514 11h1.705l2.248 2.574a.89.89 0 0 0 .965.244A.892.892 0 0 0 9 13V3c0-.378-.259-.7-.568-.813a.83.83 0 0 0-.246-.048zM8 3.37v9.297l-2.176-2.496A.5.5 0 0 0 5.447 10H3.514a.498.498 0 0 1-.506-.502l-.016-3A.487.487 0 0 1 3.486 6h2.067a.5.5 0 0 0 .383-.178L8 3.372zm2.227 2.379a.5.5 0 0 0-.33.146.5.5 0 0 0 0 .708L11.292 8 9.896 9.396a.5.5 0 0 0 0 .708.5.5 0 0 0 .708 0L12 8.707l1.396 1.397a.5.5 0 0 0 .708 0 .5.5 0 0 0 0-.708L12.707 8l1.397-1.396a.5.5 0 0 0 0-.708.5.5 0 0 0-.377-.146.5.5 0 0 0-.33.146L12 7.293l-1.396-1.397a.5.5 0 0 0-.377-.146z"/>
+  <style>#overlayStroke:not(:target) { display: none; }</style>
+  <path id="overlayStroke" style="fill:context-stroke;fill-opacity:context-stroke-opacity" d="M8.234 1.143a1.884 1.884 0 0 0-1.517.646l-.004.004L4.855 4H3.486A2.507 2.507 0 0 0 .992 6.508l.016 3.002v.002A2.529 2.529 0 0 0 3.508 12h1.258l1.95 2.236.005.004c.511.572 1.328.78 2.05.52l.012-.006.012-.004A1.897 1.897 0 0 0 10 13.016v-1.793c.465.076.961-.06 1.313-.412l.687-.69.688.69c.577.578 1.545.579 2.123.002v-.002h.002a1.516 1.516 0 0 0-.002-2.122v-.002L14.12 8l.69-.688v-.001a1.515 1.515 0 0 0 0-2.122 1.5 1.5 0 0 0-2.122 0L12 5.88l-.69-.69a1.471 1.471 0 0 0-1.119-.439c-.064.003-.127.014-.191.025V3c0-.835-.51-1.49-1.225-1.752l-.002-.002H8.77a1.833 1.833 0 0 0-.536-.103z"/>
+  <path style="fill:context-fill;fill-opacity:context-fill-opacity" d="M8.186 2.139a.882.882 0 0 0-.713.304L5.32 5H3.486c-.822 0-1.498.68-1.494 1.502l.016 3A1.514 1.514 0 0 0 3.514 11h1.705l2.248 2.574a.89.89 0 0 0 .965.244A.892.892 0 0 0 9 13V3c0-.378-.259-.7-.568-.813a.83.83 0 0 0-.246-.048zM8 3.37v9.297l-2.176-2.496A.5.5 0 0 0 5.447 10H3.514a.498.498 0 0 1-.506-.502l-.016-3A.487.487 0 0 1 3.486 6h2.067a.5.5 0 0 0 .383-.178L8 3.372zm2.227 2.379a.5.5 0 0 0-.33.146.5.5 0 0 0 0 .708L11.292 8 9.896 9.396a.5.5 0 0 0 0 .708.5.5 0 0 0 .708 0L12 8.707l1.396 1.397a.5.5 0 0 0 .708 0 .5.5 0 0 0 0-.708L12.707 8l1.397-1.396a.5.5 0 0 0 0-.708.5.5 0 0 0-.377-.146.5.5 0 0 0-.33.146L12 7.293l-1.396-1.397a.5.5 0 0 0-.377-.146z"/>
 </svg>
diff --git a/chrome/icons/audio.svg b/chrome/icons/audio.svg
index a0a9f39..7e8e351 100644
--- a/chrome/icons/audio.svg
+++ b/chrome/icons/audio.svg
@@ -1,9 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <style>
-        :root &gt; #overlayStroke:not(:target) {
-            display: none;
-        }
-    </style>
-    <path id="overlayStroke" style="fill:context-stroke;fill-opacity:context-stroke-opacity; stroke-width:0" d="M8.234 1.143a1.884 1.884 0 0 0-1.525.656L4.855 4H3.486A2.507 2.507 0 0 0 .992 6.508l.016 3v.004A2.529 2.529 0 0 0 3.514 12h1.252l1.947 2.232.008.008a1.899 1.899 0 0 0 2.074.51A1.897 1.897 0 0 0 10 13v-1.682c.135.051.239.164.607.164.37 0 .47-.137.766-.359-.43.574-.465 1.383.045 1.914.565.59 1.53.61 2.12.045l.009-.008s.52-.52.93-1.373c.404-.842.773-2.077.773-3.703 0-1.625-.367-2.858-.773-3.701-.41-.851-.93-1.371-.93-1.371a1.596 1.596 0 0 0-1.06-.42c-.389.003-.81.185-1.069.455-.508.53-.475 1.334-.049 1.908-.273-.205-.447-.372-.834-.372-.32 0-.535.194-.535.194V3a1.836 1.836 0 0 0-1.766-1.857zm4.598 2.482.014.014c.002.002-.002.005 0 .007l-.014-.021zM7 6.111v3.887l-.422-.484h-.002A1.502 1.502 0 0 0 5.446 9h-1.44l-.012-2h1.559A1.5 1.5 0 0 0 6.7 6.467zm5.846 6.24c-.002.003.002.006 0 .008l-.014.014.014-.021z"/>
-    <path style="fill:context-fill;fill-opacity:context-fill-opacity" d="M8.186 2.139a.882.882 0 0 0-.713.304L5.32 5H3.486c-.822 0-1.498.68-1.494 1.502l.016 3A1.514 1.514 0 0 0 3.514 11h1.705l2.248 2.574a.89.89 0 0 0 .965.244A.892.892 0 0 0 9 13V3c0-.378-.259-.7-.568-.813a.83.83 0 0 0-.246-.048zM8 3.37v9.297l-2.176-2.496A.5.5 0 0 0 5.447 10H3.514a.498.498 0 0 1-.506-.502l-.016-3A.487.487 0 0 1 3.486 6h2.067a.5.5 0 0 0 .383-.178L8 3.372zm4.467.129a.5.5 0 0 0-.328.154.5.5 0 0 0 .015.707s.238.219.52.805c.282.586.576 1.506.576 2.834s-.294 2.248-.576 2.834c-.282.586-.52.805-.52.805a.5.5 0 0 0-.015.707.5.5 0 0 0 .707.015s.387-.38.73-1.093c.343-.713.674-1.792.674-3.268 0-1.476-.33-2.555-.674-3.268-.343-.712-.73-1.093-.73-1.093a.5.5 0 0 0-.32-.139.5.5 0 0 0-.06 0zm-1.985 2a.5.5 0 0 0-.332.143.5.5 0 0 0-.007.707s.607.623.607 1.65-.607 1.65-.607 1.65a.5.5 0 0 0 .007.707.5.5 0 0 0 .707-.007s.893-.916.893-2.35c0-1.434-.893-2.35-.893-2.35a.5.5 0 0 0-.375-.15z"/>
+  <style>#overlayStroke:not(:target) { display: none; }</style>
+  <path id="overlayStroke" style="fill:context-stroke;fill-opacity:context-stroke-opacity" d="M8.234 1.143a1.884 1.884 0 0 0-1.517.646l-.004.004L4.855 4H3.486A2.507 2.507 0 0 0 .992 6.508l.016 3.002v.002A2.529 2.529 0 0 0 3.508 12h1.258l1.95 2.236.005.004c.511.572 1.328.78 2.05.52l.012-.006.012-.004A1.897 1.897 0 0 0 10 13.016v-1.61c.38.13.801.105 1.164-.072a1.515 1.515 0 0 0 .254 1.703c.565.59 1.53.61 2.12.045l.005-.004.004-.004s.52-.52.93-1.373c.404-.842.773-2.077.773-3.703 0-1.625-.367-2.858-.773-3.701-.41-.851-.93-1.371-.93-1.371l-.004-.004-.004-.004a1.5 1.5 0 0 0-.959-.418c-.038-.002-.075 0-.113 0h-.06l-.009.002a1.5 1.5 0 0 0-.98.459 1.515 1.515 0 0 0-.256 1.7 1.495 1.495 0 0 0-.715-.161h-.002c-.153.006-.302.04-.445.09V3c0-.835-.51-1.49-1.225-1.752l-.002-.002H8.77a1.833 1.833 0 0 0-.536-.103z"/>
+  <path style="fill:context-fill;fill-opacity:context-fill-opacity" d="M8.186 2.139a.882.882 0 0 0-.713.304L5.32 5H3.486c-.822 0-1.498.68-1.494 1.502l.016 3A1.514 1.514 0 0 0 3.514 11h1.705l2.248 2.574a.89.89 0 0 0 .965.244A.892.892 0 0 0 9 13V3c0-.378-.259-.7-.568-.813a.83.83 0 0 0-.246-.048zM8 3.37v9.297l-2.176-2.496A.5.5 0 0 0 5.447 10H3.514a.498.498 0 0 1-.506-.502l-.016-3A.487.487 0 0 1 3.486 6h2.067a.5.5 0 0 0 .383-.178L8 3.372zm4.467.129a.5.5 0 0 0-.328.154.5.5 0 0 0 .015.707s.238.219.52.805c.282.586.576 1.506.576 2.834s-.294 2.248-.576 2.834c-.282.586-.52.805-.52.805a.5.5 0 0 0-.015.707.5.5 0 0 0 .707.015s.387-.38.73-1.093c.343-.713.674-1.792.674-3.268 0-1.476-.33-2.555-.674-3.268-.343-.712-.73-1.093-.73-1.093a.5.5 0 0 0-.32-.139.5.5 0 0 0-.06 0zm-1.985 2a.5.5 0 0 0-.332.143.5.5 0 0 0-.007.707s.607.623.607 1.65-.607 1.65-.607 1.65a.5.5 0 0 0 .007.707.5.5 0 0 0 .707-.007s.893-.916.893-2.35c0-1.434-.893-2.35-.893-2.35a.5.5 0 0 0-.375-.15z"/>
 </svg>
diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css
index 58e45d9..d49b709 100644
--- a/chrome/icons/icons.css
+++ b/chrome/icons/icons.css
@@ -126,30 +126,35 @@
   list-style-image: url(download.svg#arrow-with-bar) !important;
 }
 
-@media (-moz-proton: 0) {
-  #downloads-indicator-icon {
-    background-image: url(download.svg#arrow) !important;
-  }
 
-  #downloads-button[progress] #downloads-indicator-icon {
-    background-image: url(download.svg#arrow-progress) !important;
-  }
+#downloads-indicator-icon {
+  background-image: url(download.svg#arrow) !important;
+}
 
-  #downloads-indicator-progress-outer {
-    background-image: url(download.svg#default-bar) !important;
-  }
+#downloads-button[progress] #downloads-indicator-icon {
+  background-image: url(download.svg#arrow-progress) !important;
+}
 
-  #downloads-indicator-progress-inner,
-  #downloads-button[progress]>.toolbarbutton-badge-stack>#downloads-indicator-anchor>#downloads-indicator-progress-outer {
-    background-image: url(download.svg#progress-bar-fg) !important;
-  }
+#downloads-indicator-progress-outer {
+  background-image: url(download.svg#default-bar) !important;
+}
 
-  #downloads-button[progress]>.toolbarbutton-badge-stack>#downloads-indicator-anchor>#downloads-indicator-progress-outer {
-    background-image: url(download.svg#progress-bar-bg) !important;
-  }
+#downloads-indicator-progress-inner,
+#downloads-button[progress]>.toolbarbutton-badge-stack>#downloads-indicator-anchor>#downloads-indicator-progress-outer {
+  background-image: url(download.svg#progress-bar-fg) !important;
+}
+
+#downloads-button[progress]>.toolbarbutton-badge-stack>#downloads-indicator-anchor>#downloads-indicator-progress-outer {
+  background-image: url(download.svg#progress-bar-bg) !important;
 }
 
 @media (-moz-proton) {
+  #downloads-indicator-icon,
+  #downloads-indicator-progress-outer,
+  #downloads-indicator-progress-inner {
+    background-image: none !important;
+  }
+
   #downloads-indicator-start-image {
     list-style-image: url(notification-start-animation.svg) !important;
   }
@@ -167,7 +172,7 @@
   }
 
   #downloads-button[animate][notification="finish"] > .toolbarbutton-badge-stack > #downloads-indicator-finish-box > #downloads-indicator-finish-image {
-    animation-duration: calc(var(--anim-steps) * 25ms) !important;
+    animation-duration: calc(var(--anim-steps) * 30ms) !important;
   }
 }
 
@@ -462,10 +467,8 @@ richlistitem[originaltype="loginsFooter"] .ac-site-icon,
   list-style-image: url(folder-bookmarks.svg#lightmode) !important;
 }
 
-.panel-banner-item[notificationid^="update"] {
+#PanelUI-menu-button[badge-status|="update"] {
   list-style-image: url(menu-update.svg) !important;
-  -moz-context-properties: fill, fill-opacity !important;
-  fill: currentColor !important;
 }
 
 
diff --git a/chrome/icons/media-blocked.svg b/chrome/icons/media-blocked.svg
index 9c45be8..397025f 100644
--- a/chrome/icons/media-blocked.svg
+++ b/chrome/icons/media-blocked.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-   <path
-   style="fill:context-fill;fill-opacity:context-fill-opacity"
-   d="M 0.4765625 0 A 0.5 0.5 0 0 0 0.14648438 0.14648438 A 0.5 0.5 0 0 0 0.14648438 0.85351562 L 7.5 8.2070312 L 7.5 10.404297 C 6.91605 9.8438969 6.12325 9.5 5.25 9.5 C 3.45507 9.5 2 10.9551 2 12.75 C 2 14.5449 3.45507 16 5.25 16 C 7.04493 16 8.5 14.5449 8.5 12.75 C 8.5 12.6897 8.4974406 12.629815 8.4941406 12.570312 C 8.4973406 12.547415 8.5 12.5238 8.5 12.5 L 8.5 9.2070312 L 15.146484 15.853516 A 0.5 0.5 0 0 0 15.853516 15.853516 A 0.5 0.5 0 0 0 15.853516 15.146484 L 0.85351562 0.14648438 A 0.5 0.5 0 0 0 0.4765625 0 z M 7.9160156 0.0078125 C 7.8399081 0.02078625 7.76694 0.05052125 7.703125 0.09765625 C 7.575485 0.19192625 7.5 0.34133 7.5 0.5 L 7.5 5.3789062 L 8.5 6.3789062 L 8.5 5.1777344 L 14.353516 6.9785156 C 14.505116 7.0251856 14.669175 6.9966137 14.796875 6.9023438 C 14.924475 6.8080739 15 6.65868 15 6.5 L 15 3.9765625 C 15 2.8790525 14.283375 1.9106506 13.234375 1.5878906 L 8.1464844 0.021484375 C 8.0706794 -0.001845635 7.9921231 -0.00516125 7.9160156 0.0078125 z M 8.5 1.1777344 L 12.941406 2.5429688 C 13.570806 2.7366286 14 3.3180625 14 3.9765625 L 14 5.8222656 L 8.5 4.1308594 L 8.5 1.1777344 z M 5.25 10.5 C 6.49264 10.5 7.5 11.5074 7.5 12.75 C 7.5 13.9926 6.49264 15 5.25 15 C 4.00736 15 3 13.9926 3 12.75 C 3 11.5074 4.00736 10.5 5.25 10.5 z " />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path style="fill:context-fill;fill-opacity:context-fill-opacity" d="M2.477 2a.5.5 0 0 0-.33.147.5.5 0 0 0 0 .707L7 7.707V9.5a2.5 2.5 0 1 0 1 2V8.707l5.146 5.147a.5.5 0 0 0 .708 0 .5.5 0 0 0 0-.707L8 7.293l-1-1-4.146-4.146a.5.5 0 0 0-.377-.146zM7.48 2a.5.5 0 0 0-.48.5v2.38l1.29 1.288 4.112.823A.5.5 0 0 0 13 6.5V4.53c0-.834-.595-1.56-1.414-1.724L7.598 2.01A.5.5 0 0 0 7.48 2zM8 3.11l3.39.678c.358.071.61.38.61.744V5.89l-4-.8zM5.5 10a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
 </svg>