Bug 1413780 - Update icon design and add blocked effect.
MozReview-Commit-ID: 1J0q39u9A5I
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -810,16 +810,18 @@
<image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
<image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
tooltiptext="&urlbar.screenBlocked.tooltip;"/>
<image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
<image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
tooltiptext="&urlbar.popupBlocked.tooltip;"/>
+ <image data-permission-id="canvas/extractData" class="blocked-permission-icon canvas/extractData-icon" role="button"
+ tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
</box>
<box id="notification-popup-box"
hidden="true"
onmouseover="document.getElementById('identity-box').classList.add('no-hover');"
onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
align="center">
<image id="default-notification-icon" class="notification-anchor-icon" role="button"
tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -229,16 +229,17 @@ These should match what Safari and other
<!ENTITY urlbar.cameraBlocked.tooltip "You have blocked your camera for this website.">
<!ENTITY urlbar.microphoneBlocked.tooltip "You have blocked your microphone for this website.">
<!ENTITY urlbar.screenBlocked.tooltip "You have blocked this website from sharing your screen.">
<!ENTITY urlbar.geolocationBlocked.tooltip "You have blocked location information for this website.">
<!ENTITY urlbar.webNotificationsBlocked.tooltip "You have blocked notifications for this website.">
<!ENTITY urlbar.persistentStorageBlocked.tooltip "You have blocked persistent storage for this website.">
<!ENTITY urlbar.popupBlocked.tooltip "You have blocked pop-ups for this website.">
+<!ENTITY urlbar.canvasBlocked.tooltip "You have blocked canvas data extraction for this website.">
<!ENTITY urlbar.openHistoryPopup.tooltip "Show history">
<!ENTITY searchItem.title "Search">
<!-- Toolbar items -->
<!ENTITY homeButton.label "Home">
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -49,16 +49,17 @@
skin/classic/browser/identity-icon-notice.svg (../shared/identity-block/identity-icon-notice.svg)
skin/classic/browser/info.svg (../shared/info.svg)
skin/classic/browser/searchReset.css (../shared/searchReset.css)
skin/classic/browser/illustrations/error-session-restore.svg (../shared/illustrations/error-session-restore.svg)
skin/classic/browser/notification-icons/camera-blocked.svg (../shared/notification-icons/camera-blocked.svg)
skin/classic/browser/notification-icons/camera.svg (../shared/notification-icons/camera.svg)
+ skin/classic/browser/notification-icons/canvas-blocked.svg (../shared/notification-icons/canvas-blocked.svg)
skin/classic/browser/notification-icons/canvas.svg (../shared/notification-icons/canvas.svg)
skin/classic/browser/notification-icons/default-info.svg (../shared/notification-icons/default-info.svg)
skin/classic/browser/notification-icons/desktop-notification-blocked.svg (../shared/notification-icons/desktop-notification-blocked.svg)
skin/classic/browser/notification-icons/desktop-notification.svg (../shared/notification-icons/desktop-notification.svg)
skin/classic/browser/notification-icons/focus-tab-by-prompt.svg (../shared/notification-icons/focus-tab-by-prompt.svg)
skin/classic/browser/notification-icons/indexedDB.svg (../shared/notification-icons/indexedDB.svg)
skin/classic/browser/notification-icons/login-detailed.svg (../shared/notification-icons/login-detailed.svg)
skin/classic/browser/notification-icons/login.svg (../shared/notification-icons/login.svg)
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -109,20 +109,25 @@
list-style-image: url(chrome://browser/skin/notification-icons/screen.svg);
}
.screen-icon.blocked-permission-icon {
list-style-image: url(chrome://browser/skin/notification-icons/screen-blocked.svg);
}
#canvas-notification-icon,
-.popup-notification-icon[popupid="canvas-permissions-prompt"] {
+.popup-notification-icon[popupid="canvas-permissions-prompt"],
+.canvas\/extractData-icon {
list-style-image: url(chrome://browser/skin/notification-icons/canvas.svg);
}
+.canvas\/extractData-icon.blocked-permission-icon {
+ list-style-image: url(chrome://browser/skin/notification-icons/canvas-blocked.svg);
+}
+
#webRTC-preview:not([hidden]) {
display: -moz-stack;
border-radius: 4px;
border: 1px solid GrayText;
overflow: hidden;
min-width: 300px;
min-height: 10em;
}
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/notification-icons/canvas-blocked.svg
@@ -0,0 +1,6 @@
+<!-- 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" width="16" height="16" viewBox="0 0 43.688 44.188" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="M39.687 41.687H11.816l3.946-4h20.925c2.209 0 3-.791 3-3V13.435l4-4.055v28.307a4 4 0 0 1-4 4zm-5.529-19.5l3.529 3.6v9.9H17.735l12.324-12.492 1.452 1.692zM5.349 43.222l-.076.077a3.081 3.081 0 0 1-4.4-.077 3.184 3.184 0 0 1 .076-4.459l.776-.786c-.007-.099-.038-.19-.038-.29v-30a4 4 0 0 1 4-4h29.866L38.279.924a3.081 3.081 0 0 1 4.4 0 3.184 3.184 0 0 1 0 4.459zM8.687 7.687c-2.209 0-3 .791-3 3v23.274l4.455-4.516 17.893-18.137 3.572-3.621H8.687zm4.733 12.7a5.852 5.852 0 1 1 5.733-5.851 5.793 5.793 0 0 1-5.733 5.851z"/>
+</svg>
--- a/browser/themes/shared/notification-icons/canvas.svg
+++ b/browser/themes/shared/notification-icons/canvas.svg
@@ -1,7 +1,6 @@
<!-- 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" width="16" height="16" viewBox="0 0 481.156 508.687" fill="context-fill" fill-opacity="context-fill-opacity">
- <path d="M477.656 289.656c-36.133 224.615-220.16 222.188-283 218C22.22 496.163-68.584 254.586 61.98 128.066l105.857 105.872c-7.183 24.6 2.7 54.1 42.418 70.59 42.865 17.8 87.4 9.747 87.4 9.747s-14.08-22.03-15.565-68.266c-1.1-34.2-40.15-55.996-72.513-50.483L108.757 94.69c30.6-12.34 59.033-1.8 69.9 6.966 26.87 21.688 16.616 68.436 53 54 70.87-28.12-40.744-132.32 53-154 79.026-18.278 220.516 116.945 193 288zm-371-14a41 41 0 1 0 41 41 41 41 0 0 0-41-41zm149.5 92a43.5 43.5 0 1 0 43.5 43.5 43.5 43.5 0 0 0-43.5-43.5zm97.5-273a40 40 0 1 0 40 40 40 40 0 0 0-40-40zm24.5 141a45.5 45.5 0 1 0 45.5 45.5 45.5 45.5 0 0 0-45.5-45.5z"/>
- <path d="M213.656 296.656c-36.083-15.022-42.678-42.92-33.52-64.423L35.847 87.925a17.732 17.732 0 0 1 25.076-25.078L205.45 207.393c28.076-10.037 67.206 8.853 68.206 40.263 1.24 38.716 13 58 13 58s-37.2 5.905-73-9z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 42 38" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="M38 38H4a4 4 0 0 1-4-4V4a4 4 0 0 1 4-4h34a4 4 0 0 1 4 4v30a4 4 0 0 1-4 4zm0-31c0-2.209-.791-3-3-3H7c-2.209 0-3 .791-3 3v24c0 2.209.791 3 3 3h28c2.209 0 3-.791 3-3V7zM6 28.6l5.412-5.5 1.647 1.7L23.647 14l6.176 7.2 2.647-2.7L36 22.1V32H6v-3.4zm5.733-11.9a5.852 5.852 0 1 1 5.733-5.851 5.793 5.793 0 0 1-5.733 5.851z"/>
</svg>