Bug 1302307 - Separate blocked permission icon styles in identity block and control center. r?florian
MozReview-Commit-ID: GsJ1Zpvg8xF
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -747,17 +747,17 @@ html|*#fullscreen-exit-button {
/* notification anchors should only be visible when their associated
notifications are */
.notification-anchor-icon {
-moz-user-focus: normal;
}
-#blocked-permissions-container > .blocked-permission-icon:not([showing]),
+.blocked-permission-icon:not([showing]),
.notification-anchor-icon:not([showing]) {
display: none;
}
#invalid-form-popup > description {
max-width: 280px;
}
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7404,17 +7404,17 @@ var gIdentityHandler = {
_createPermissionItem: function (aPermission) {
let container = document.createElement("hbox");
container.setAttribute("class", "identity-popup-permission-item");
container.setAttribute("align", "center");
let img = document.createElement("image");
let classes = "identity-popup-permission-icon " + aPermission.id + "-icon";
if (aPermission.state == SitePermissions.BLOCK)
- classes += " blocked-permission-icon";
+ classes += " blocked";
if (aPermission.inUse)
classes += " in-use";
img.setAttribute("class", classes);
let nameLabel = document.createElement("label");
nameLabel.setAttribute("flex", "1");
nameLabel.setAttribute("class", "identity-popup-permission-label");
nameLabel.textContent = SitePermissions.getPermissionLabel(aPermission.id);
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -687,27 +687,27 @@
onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
ondragstart="gIdentityHandler.onDragStart(event);">
<image id="identity-icon"
consumeanchor="identity-box"
onclick="PageProxyClickHandler(event);"/>
<image id="sharing-icon" mousethrough="always"/>
<box id="blocked-permissions-container" align="center">
- <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
+ <image data-permission-id="geo" class="blocked-permission-icon geo-icon blocked" role="button"
tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
- <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
+ <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon blocked" role="button"
tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
- <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
+ <image data-permission-id="camera" class="blocked-permission-icon camera-icon blocked" role="button"
tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
- <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button"
+ <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon blocked" role="button"
tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/>
- <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
+ <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon blocked" role="button"
tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
- <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
+ <image data-permission-id="screen" class="blocked-permission-icon screen-icon blocked" role="button"
tooltiptext="&urlbar.screenBlocked.tooltip;"/>
</box>
<box id="notification-popup-box"
hidden="true"
onmouseover="document.getElementById('identity-icon').classList.add('no-hover');"
onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');"
align="center">
<image id="default-notification-icon" class="notification-anchor-icon" role="button"
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -73,31 +73,31 @@
/* INDIVIDUAL NOTIFICATIONS */
.popup-notification-icon[popupid="web-notifications"],
.desktop-notification-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification);
}
-.desktop-notification-icon.blocked-permission-icon {
+.desktop-notification-icon.blocked {
list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification-blocked);
}
.geo-icon {
%ifdef XP_MACOSX
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-osx);
%elif defined(MOZ_WIDGET_GTK)
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-linux);
%else
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows);
%endif
}
-.geo-icon.blocked-permission-icon {
+.geo-icon.blocked {
%ifdef XP_MACOSX
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-osx-blocked);
%elif defined(MOZ_WIDGET_GTK)
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-linux-blocked);
%else
list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-blocked);
%endif
}
@@ -112,55 +112,55 @@
%endif
}
.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
.indexedDB-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB);
}
-.indexedDB-icon.blocked-permission-icon {
+.indexedDB-icon.blocked {
list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB-blocked);
}
.login-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#login);
}
.popup-notification-icon[popupid="password"] {
list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed);
}
.camera-icon,
.popup-notification-icon[popupid="webRTC-shareDevices"] {
list-style-image: url(chrome://browser/skin/notification-icons.svg#camera);
}
-.camera-icon.blocked-permission-icon {
+.camera-icon.blocked {
list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-blocked);
}
.microphone-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone);
}
-.microphone-icon.blocked-permission-icon {
+.microphone-icon.blocked {
list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked);
}
.popup-notification-icon[popupid="webRTC-shareMicrophone"] {
list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed);
}
.popup-notification-icon[popupid="webRTC-shareScreen"],
.screen-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#screen);
}
-.screen-icon.blocked-permission-icon {
+.screen-icon.blocked {
list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked);
}
/* This icon has a block sign in it, so we don't need a blocked version. */
.popup-icon {
list-style-image: url("chrome://browser/skin/notification-icons.svg#popup");
}