Issue #638 - Part 7: Remove hover and active states for sound indicator

2 files changed, 53 insertions, 148 deletions

diff --git a/application/palemoon/themes/shared/tabbrowser/tab-audio-small.svg b/application/palemoon/themes/shared/tabbrowser/tab-audio-small.svg
index da4ad3ef9..abfe71268 100644
--- a/application/palemoon/themes/shared/tabbrowser/tab-audio-small.svg
+++ b/application/palemoon/themes/shared/tabbrowser/tab-audio-small.svg
@@ -4,82 +4,55 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
   <style>
-    use:not(:target) {
+    .icon:not(:target) {
       display: none;
     }
+
     .icon {
-      fill: #4d4d4d;
+      fill: #262626;
     }
-    .icon.hover {
-      fill: #333333;
-    }
-    .icon.pressed {
-      fill: #000;
-    }
-    .icon.dark {
-      fill: #ccc;
-    }
-    .icon.dark.hover {
-      fill: #b2b2b2;
-    }
-    .icon.dark.pressed {
+    .icon > .outline {
       fill: #fff;
     }
-    .muted {
-      opacity: .7;
-      stroke: #4d4d4d;
-      stroke-width: 0;
-    }
-    .muted.hover {
-      opacity: .85;
-      stroke: #333333;
-    }
-    .muted.pressed {
-      opacity: 1;
-      stroke: #000;
-    }
-    .muted.dark {
-      stroke: #ccc;
-    }
-    .muted.dark.hover {
-      stroke: #b2b2b2;
+
+    .icon.white {
+      fill: #fff;
     }
-    .muted.dark.pressed {
-      stroke: #fff;
+    .icon.white > .outline {
+      fill: #000;
+      fill-opacity: .5;
     }
   </style>
-  <defs>
-    <clipPath id="clip-wave">
-      <path d="M 11,7 l 3,-8 l 2,0 l 0,18 l -2,0 l -3,-8 z" />
-    </clipPath>
-    <mask id="disabled-cutout">
-      <rect width="16" height="16" fill="#fff" />
-      <line x1="4" y1="14" x2="14" y2="4" stroke="#000" stroke-width="2" />
-    </mask>
-    <g id="shape-tab-audio">
-      <rect x="3" y="6" width="5" height="4" rx="1" ry="1" />
-      <polygon points="5.5,6.5 9,3 9,13 5.5,9.5" />
-      <path d="M 10,6.5 a 1.5 1.5 0 0,1 0,3 z" />
-      <path d="M 10,4 a 4 4 0 0,1 0,8 l 0,-1 a 3 3 0 0,0 0,-6 z"  clip-path="url(#clip-wave)" />
-    </g>
-    <g id="shape-tab-audio-muted">
-      <g mask="url(#disabled-cutout)">
-        <rect x="4" y="6" width="5" height="4" rx="1" ry="1" />
-        <polygon points="6.5,6.5 10,3 10,13 6.5,9.5" />
-      </g>
-      <line x1="3" y1="14" x2="13" y2="4" stroke-width="1.5" />
-    </g>
-  </defs>
-  <use id="tab-audio" class="icon" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-hover" class="icon hover" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-pressed" class="icon pressed" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-muted" class="icon muted" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-hover" class="icon muted hover" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-pressed" class="icon muted pressed" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-dark" class="icon dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-dark-hover" class="icon hover dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-dark-pressed" class="icon pressed dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-muted-dark" class="icon muted dark" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-dark-hover" class="icon muted hover dark" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-dark-pressed" class="icon muted pressed dark" xlink:href="#shape-tab-audio-muted" />
-</svg>
\ No newline at end of file
+
+  <g id="tab-audio" class="icon">
+    <path class="outline" d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z"/>
+    <path d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z"/>
+  </g>
+  <g id="tab-audio-muted" class="icon">
+    <path class="outline" d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z"/>
+    <path d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z"/>
+  </g>
+
+  <g id="tab-audio-white" class="icon white">
+    <path class="outline" d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z"/>
+    <path d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z"/>
+  </g>
+  <g id="tab-audio-white-muted" class="icon white">
+    <path class="outline" d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z"/>
+    <path d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z"/>
+  </g>
+
+  <g id="tab-audio-blocked" class="icon">
+    <path class="outline" d="M8,1.2C4.3,1.2,1.2,4.3,1.2,8s3.1,6.8,6.8,6.8s6.8-3.1,6.8-6.8S11.7,1.2,8,1.2z M8,11.9
+      c-2.1,0-3.9-1.7-3.9-3.9c0-2.1,1.7-3.9,3.9-3.9s3.9,1.7,3.9,3.9C11.9,10.1,10.1,11.9,8,11.9z M11.1,7.3L6.6,4.6L5.4,3.9v1.4v5.3V12
+      l1.2-0.7L11,8.6L12.2,8L11.1,7.3z"/>
+    <path d="M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z M8,12.7c-2.6,0-4.7-2.1-4.7-4.7
+      S5.4,3.3,8,3.3s4.7,2.1,4.7,4.7S10.6,12.7,8,12.7z M10.7,8L6.2,5.3v5.4L10.7,8z"/>
+  </g>
+  <g id="tab-audio-white-blocked" class="icon">
+    <path class="outline" d="M8,0c3.3,0,6.4,2.2,7.5,5.3c1.1,3.1,0.1,6.7-2.5,8.9c-2.6,2.1-6.3,2.4-9.2,0.7
+      C1,13.1-0.5,9.8,0.1,6.5C0.9,2.8,4.2,0,8,0z"/>
+    <path d="M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z M8,12.7c-2.6,0-4.7-2.1-4.7-4.7
+      S5.4,3.3,8,3.3s4.7,2.1,4.7,4.7S10.6,12.7,8,12.7z M10.7,8L6.2,5.3v5.4L10.7,8z"/>
+  </g>
+</svg>
diff --git a/application/palemoon/themes/shared/tabbrowser/tab-audio.svg b/application/palemoon/themes/shared/tabbrowser/tab-audio.svg
index 1949c0595..274e10c29 100644
--- a/application/palemoon/themes/shared/tabbrowser/tab-audio.svg
+++ b/application/palemoon/themes/shared/tabbrowser/tab-audio.svg
@@ -2,85 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
   <style>
-    use:not(:target) {
+    path:not(:target) {
       display: none;
     }
-    .icon {
-      fill: #666;
-    }
-    .icon.hover {
-      fill: #4d4d4d;
-    }
-    .icon.pressed {
-      fill: #000;
-    }
-    .icon.dark {
-      fill: #999;
-    }
-    .icon.dark.hover {
-      fill: #b2b2b2;
-    }
-    .icon.dark.pressed {
-      fill: #fff;
-    }
-    .muted {
-      opacity: .7;
-      stroke: #666;
-      stroke-width: 0;
-    }
-    .muted.hover {
-      opacity: .85;
-      stroke: #4d4d4d;
-    }
-    .muted.pressed {
-      opacity: 1;
-      stroke: #000;
-    }
-    .muted.dark {
-      stroke: #999;
-    }
-    .muted.dark.hover {
-      stroke: #b2b2b2;
-    }
-    .muted.dark.pressed {
-      stroke: #fff;
-    }
   </style>
-  <defs>
-    <clipPath id="clip-wave">
-      <path d="M 10,7 l 3,-8 l 2,0 l 0,18 l -2,0 l -3,-8 z" />
-    </clipPath>
-    <mask id="disabled-cutout">
-      <rect width="16" height="16" fill="#fff" />
-      <line x1="4" y1="14" x2="14" y2="4" stroke="#000" stroke-width="2" />
-    </mask>
-    <g id="shape-tab-audio">
-      <rect x="2" y="5" width="6" height="6" rx="2" ry="2" />
-      <polygon points="4,6 9,2 9,14 4,10" />
-      <path d="M 10,7 a 1 1 0 0,1 0,2 z" />
-      <path d="M 10,5 a 3 3 0 0,1 0,6 l 0,-1 a 2 2 0 0,0 0,-4 z"  clip-path="url(#clip-wave)" />
-      <path d="M 10,3 a 5 5 0 0,1 0,10 l 0,-1 a 4 4 0 0,0 0,-8 z" clip-path="url(#clip-wave)" />
-    </g>
-    <g id="shape-tab-audio-muted">
-      <g mask="url(#disabled-cutout)">
-        <rect x="3" y="5" width="6" height="6" rx="2" ry="2" />
-        <polygon points="5,6 10,2 10,14 5,10" />
-      </g>
-      <line x1="2" y1="13" x2="14" y2="3" stroke-width="1.5" />
-    </g>
-  </defs>
-  <use id="tab-audio" class="icon" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-hover" class="icon hover" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-pressed" class="icon pressed" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-muted" class="icon muted" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-hover" class="icon muted hover" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-pressed" class="icon muted pressed" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-dark" class="icon dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-dark-hover" class="icon hover dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-dark-pressed" class="icon pressed dark" xlink:href="#shape-tab-audio"/>
-  <use id="tab-audio-muted-dark" class="icon muted dark" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-dark-hover" class="icon muted hover dark" xlink:href="#shape-tab-audio-muted" />
-  <use id="tab-audio-muted-dark-pressed" class="icon muted pressed dark" xlink:href="#shape-tab-audio-muted" />
-</svg>
\ No newline at end of file
+
+  <path id="tab-audio" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/>
+
+  <path id="tab-audio-muted" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/>
+
+  <path id="tab-audio-blocked" d="M8,0C3.6,0,0,3.6,0,8s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z M5.6,11.6l6-3.6l-6-3.6V11.6z M8,14.2
+  c-3.4,0-6.2-2.8-6.2-6.2S4.6,1.8,8,1.8s6.2,2.8,6.2,6.2S11.4,14.2,8,14.2z"/>
+</svg>