diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 838dba242d38..5f4de0aeb8f9 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -222,7 +222,9 @@ skin/classic/browser/tabbrowser/loading.svg (../shared/tabbrowser/loading.svg) skin/classic/browser/tabbrowser/loading-burst.svg (../shared/tabbrowser/loading-burst.svg) skin/classic/browser/tabbrowser/pendingpaint.png (../shared/tabbrowser/pendingpaint.png) + skin/classic/browser/tabbrowser/tab-audio-playing.svg (../shared/tabbrowser/tab-audio-playing.svg) skin/classic/browser/tabbrowser/tab-audio-playing-small.svg (../shared/tabbrowser/tab-audio-playing-small.svg) + skin/classic/browser/tabbrowser/tab-audio-muted.svg (../shared/tabbrowser/tab-audio-muted.svg) skin/classic/browser/tabbrowser/tab-audio-muted-small.svg (../shared/tabbrowser/tab-audio-muted-small.svg) skin/classic/browser/tabbrowser/tab-audio-blocked.svg (../shared/tabbrowser/tab-audio-blocked.svg) skin/classic/browser/tabbrowser/tab-audio-blocked-small.svg (../shared/tabbrowser/tab-audio-blocked-small.svg) diff --git a/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg b/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg index 89795c27fc4d..62724b0dcd2d 100644 --- a/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg +++ b/browser/themes/shared/tabbrowser/tab-audio-muted-small.svg @@ -1,7 +1,10 @@ - - - + + + + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-muted.svg b/browser/themes/shared/tabbrowser/tab-audio-muted.svg new file mode 100644 index 000000000000..79e064f80c71 --- /dev/null +++ b/browser/themes/shared/tabbrowser/tab-audio-muted.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg b/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg index 68ee22e39821..e5f0149a0866 100644 --- a/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg +++ b/browser/themes/shared/tabbrowser/tab-audio-playing-small.svg @@ -2,6 +2,7 @@ - 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/. --> - - + + + diff --git a/browser/themes/shared/tabbrowser/tab-audio-playing.svg b/browser/themes/shared/tabbrowser/tab-audio-playing.svg new file mode 100644 index 000000000000..b9b2f5aecc56 --- /dev/null +++ b/browser/themes/shared/tabbrowser/tab-audio-playing.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index ea9ee62ebc2b..7c305c5112b4 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -384,24 +384,16 @@ } .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) { - top: -5.5px; - inset-inline-end: -6px; + top: -4.5px; + inset-inline-end: -9px; z-index: 1; /* Overlay tab title */ padding: 2px; } -#TabsToolbar:not([brighttext]) .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) { - stroke: white; -} - -#TabsToolbar[brighttext] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):not(:hover) { - stroke: black; -} - @media not (-moz-proton) { .tab-icon-overlay[pictureinpicture] { - top: -5.5px; - inset-inline-end: -6px; + top: -4.5px; + inset-inline-end: -9px; z-index: 1; /* Overlay tab title */ padding: 0; } @@ -419,16 +411,14 @@ .tab-icon-overlay[muted]:not([crashed]), .tab-icon-overlay[activemedia-blocked]:not([crashed]) { border-radius: 10px; - -moz-context-properties: fill, fill-opacity, stroke; + -moz-context-properties: fill, fill-opacity; fill: currentColor; - stroke: transparent; } .tab-icon-overlay:is([pinned], [sharing]):not([crashed])[soundplaying]:hover, .tab-icon-overlay:is([pinned], [sharing]):not([crashed])[muted]:hover, .tab-icon-overlay:is([pinned], [sharing]):not([crashed])[activemedia-blocked]:hover { background-color: white; - stroke: white; color: black; } @@ -1050,10 +1040,9 @@ /* Match the color of the button, rather than label default. */ color: inherit; display: block; - -moz-context-properties: fill, fill-opacity, stroke; + -moz-context-properties: fill, fill-opacity; fill: currentColor; fill-opacity: var(--toolbarbutton-icon-fill-opacity); - stroke: transparent; /* "!important" is necessary to override the rule in toolbarbutton.css */ margin: -7px 0 0 !important; margin-inline-end: -4px !important; @@ -1119,11 +1108,11 @@ } .all-tabs-secondary-button[soundplaying] { - list-style-image: url(chrome://global/skin/media/audio.svg); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-playing.svg); } .all-tabs-secondary-button[muted] { - list-style-image: url(chrome://global/skin/media/audio-muted.svg); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-muted.svg); } @media (-moz-proton) {