From 620b145d13eee3559f5bce8f0dbfb3d3ca597e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Fri, 23 Sep 2016 15:38:51 +0200 Subject: [PATCH] Bug 1304708 - Use icon-colors.inc.svg in notification-icons.svg. r=jhofmann --- .../themes/shared/controlcenter/panel.inc.css | 2 - .../identity-block/identity-block.inc.css | 8 ++-- browser/themes/shared/jar.inc.mn | 2 +- .../themes/shared/notification-icons.inc.css | 38 ++++++++----------- browser/themes/shared/notification-icons.svg | 18 +++++++++ .../themes/shared/plugin-doorhanger.inc.css | 4 -- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css index d359a887490d..20d8686ffc6c 100644 --- a/browser/themes/shared/controlcenter/panel.inc.css +++ b/browser/themes/shared/controlcenter/panel.inc.css @@ -376,8 +376,6 @@ description#identity-popup-content-verifier, } .identity-popup-permission-icon.in-use { - fill: rgb(224, 41, 29); - opacity: 1; animation: 1.5s ease in-use-blink infinite; } diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index d0b9edb1abca..01922edb52b0 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -109,21 +109,19 @@ } #identity-box[sharing="camera"] > #sharing-icon { - list-style-image: url("chrome://browser/skin/notification-icons.svg#camera"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#camera-sharing"); } #identity-box[sharing="microphone"] > #sharing-icon { - list-style-image: url("chrome://browser/skin/notification-icons.svg#microphone"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#microphone-sharing"); } #identity-box[sharing="screen"] > #sharing-icon { - list-style-image: url("chrome://browser/skin/notification-icons.svg#screen"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#screen-sharing"); } #identity-box[sharing] > #sharing-icon { display: -moz-box; - filter: url("chrome://browser/skin/filters.svg#fill"); - fill: rgb(224, 41, 29); animation-delay: -1.5s; } diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 7138cd072f2c..b2d10c66fd4f 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -68,7 +68,7 @@ skin/classic/browser/info.svg (../shared/info.svg) * skin/classic/browser/menuPanel.svg (../shared/menuPanel.svg) * skin/classic/browser/menuPanel-small.svg (../shared/menuPanel-small.svg) - skin/classic/browser/notification-icons.svg (../shared/notification-icons.svg) +* skin/classic/browser/notification-icons.svg (../shared/notification-icons.svg) * skin/classic/browser/tracking-protection-16.svg (../shared/identity-block/tracking-protection-16.svg) skin/classic/browser/newtab/close.png (../shared/newtab/close.png) skin/classic/browser/newtab/controls.svg (../shared/newtab/controls.svg) diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 1dbccd6ee31c..4521509aba2c 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -45,30 +45,14 @@ margin-inline-end: 10px; } -.camera-icon, -.geo-icon, -.indexedDB-icon, -.install-icon, -.login-icon, -.microphone-icon, -.plugin-icon, -.popup-icon, -.screen-icon, -.desktop-notification-icon, -.popup-notification-icon[popupid="geolocation"], -.popup-notification-icon[popupid="indexedDB-permissions-prompt"], -.popup-notification-icon[popupid="password"], -.popup-notification-icon[popupid="webRTC-shareDevices"], -.popup-notification-icon[popupid="webRTC-shareMicrophone"], -.popup-notification-icon[popupid="webRTC-shareScreen"], -.popup-notification-icon[popupid="web-notifications"] { +.notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, +#blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { filter: url(chrome://browser/skin/filters.svg#fill); fill: currentColor; - opacity: .4; } -.notification-anchor-icon:not(.plugin-blocked):hover { - opacity: .6; +.notification-anchor-icon:not(.plugin-blocked):not(:hover) { + opacity: .8; } /* INDIVIDUAL NOTIFICATIONS */ @@ -134,6 +118,10 @@ list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } +.camera-icon.in-use { + list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-sharing); +} + .camera-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-blocked); } @@ -142,6 +130,10 @@ list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone); } +.microphone-icon.in-use { + list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-sharing); +} + .microphone-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } @@ -155,6 +147,10 @@ list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } +.screen-icon.in-use { + list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-sharing); +} + .screen-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } @@ -241,8 +237,6 @@ .plugin-icon.plugin-blocked { list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked); - fill: #d92215; - opacity: 1; } #notification-popup-box[hidden] { diff --git a/browser/themes/shared/notification-icons.svg b/browser/themes/shared/notification-icons.svg index 7868c62b4633..09b97533bee9 100644 --- a/browser/themes/shared/notification-icons.svg +++ b/browser/themes/shared/notification-icons.svg @@ -4,7 +4,9 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +#include icon-colors.inc.svg @@ -43,6 +58,7 @@ + @@ -59,12 +75,14 @@ + + diff --git a/browser/themes/shared/plugin-doorhanger.inc.css b/browser/themes/shared/plugin-doorhanger.inc.css index 7ceb9530831c..dd315bb8b0d8 100644 --- a/browser/themes/shared/plugin-doorhanger.inc.css +++ b/browser/themes/shared/plugin-doorhanger.inc.css @@ -51,8 +51,6 @@ .messageImage[value="plugin-hidden"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin); - filter: url(chrome://browser/skin/filters.svg#fill); - fill: #808080; } /* Keep any changes to this style in sync with pluginProblem.css */ @@ -64,6 +62,4 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked); - filter: url(chrome://browser/skin/filters.svg#fill); - fill: #d92215; }