Bug 1482646 - Update icons for autoplay media. r=dao
authorDale Harvey <dale@arandomurl.com>
Mon, 27 Aug 2018 18:32:22 +0100
changeset 488714 ea6c1463602cb9f7bad261326b7a0041b12a5dda
parent 488713 1507e086acbcf9e0c60cfa7e89dd31995950e520
child 488715 27b7d1d053fb992fdc742aaa15b2395cf12ed211
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1482646
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1482646 - Update icons for autoplay media. r=dao MozReview-Commit-ID: 2CY2yeXF16N
browser/themes/shared/jar.inc.mn
browser/themes/shared/notification-icons.inc.css
browser/themes/shared/notification-icons/autoplay-media-blocked.svg
browser/themes/shared/notification-icons/autoplay-media-detailed.svg
browser/themes/shared/notification-icons/autoplay-media.svg
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -56,16 +56,17 @@
   skin/classic/browser/identity-icon.svg                       (../shared/identity-block/identity-icon.svg)
   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/autoplay-media.svg                (../shared/notification-icons/autoplay-media.svg)
+  skin/classic/browser/notification-icons/autoplay-media-detailed.svg       (../shared/notification-icons/autoplay-media-detailed.svg)
   skin/classic/browser/notification-icons/autoplay-media-blocked.svg        (../shared/notification-icons/autoplay-media-blocked.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)
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -52,29 +52,32 @@
 .geo-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/geo.svg);
 }
 
 .geo-icon.blocked-permission-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/geo-blocked.svg);
 }
 
-.popup-notification-icon[popupid="autoplay-media"],
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url(chrome://browser/skin/notification-icons/geo-detailed.svg);
+}
+
 .autoplay-media-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/autoplay-media.svg);
 }
 
+.popup-notification-icon[popupid="autoplay-media"] {
+  list-style-image: url(chrome://browser/skin/notification-icons/autoplay-media-detailed.svg);
+}
+
 .autoplay-media-icon.blocked-permission-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/autoplay-media-blocked.svg);
 }
 
-.popup-notification-icon[popupid="geolocation"] {
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-detailed.svg);
-}
-
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .indexedDB-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/indexedDB.svg);
 }
 
 .login-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/login.svg);
 }
--- a/browser/themes/shared/notification-icons/autoplay-media-blocked.svg
+++ b/browser/themes/shared/notification-icons/autoplay-media-blocked.svg
@@ -1,7 +1,8 @@
 <!-- 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" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M12 8a4 4 0 1 0 0 8 4 4 0 0 0 0-8zm0 1c.62 0 1.23.2 1.73.56l-4.17 4.17A3 3 0 0 1 12 9zm0 6c-.62 0-1.23-.2-1.73-.56l4.17-4.17A3 3 0 0 1 12 15zm-1.77-7.68a5.02 5.02 0 0 0-2.88 2.83l-1.53.79a.6.6 0 0 1-.55 0 .48.48 0 0 1-.27-.42V5.48c0-.17.1-.33.27-.42a.6.6 0 0 1 .55 0l4.4 2.26z"/>
-  <path d="M13.61 5.7a1 1 0 0 1-1.89.65 5 5 0 1 0-5.54 6.58 1 1 0 1 1-.33 1.98 7 7 0 1 1 7.76-9.22z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.944 4.056l-1.478 1.478a5.989 5.989 0 0 1-7.93 7.93l-1.485 1.485A7.981 7.981 0 0 0 14.944 4.056z"/>
+  <path d="M11.974 7.026l-4.608 4.608 4.8-2.771a1 1 0 0 0 0-1.726z"/>
+  <path d="M14.707 1.293a1 1 0 0 0-1.414 0l-.4.4A7.8 7.8 0 0 0 10.98.574a1 1 0 0 0-.746 1.856 5.767 5.767 0 0 1 1.234.688L9.175 5.411 6.494 3.863A1 1 0 0 0 5 4.726v4.86l-1.885 1.885A5.919 5.919 0 0 1 3 4.721V6a.5.5 0 0 0 1 0V2.5a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0 0 1h1.262a7.963 7.963 0 0 0-.074 9.9l-.395.395a1 1 0 1 0 1.414 1.414l12-12a1 1 0 0 0 0-1.416z"/>
 </svg>
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/notification-icons/autoplay-media-detailed.svg
@@ -0,0 +1,7 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M21.954 1.185a1.5 1.5 0 0 0-1.117 2.784A12.961 12.961 0 1 1 5 9.207V10.5a1.5 1.5 0 0 0 3 0v-6A1.5 1.5 0 0 0 6.5 3h-5a1.5 1.5 0 0 0 0 3h2.1a15.934 15.934 0 1 0 18.354-4.815z"/>
+  <path d="M13 24.245l11.325-6.538a1.99 1.99 0 0 0 0-3.446L13 7.723a1.989 1.989 0 0 0-2.984 1.723v13.076A1.989 1.989 0 0 0 13 24.245z"/>
+</svg>
--- a/browser/themes/shared/notification-icons/autoplay-media.svg
+++ b/browser/themes/shared/notification-icons/autoplay-media.svg
@@ -1,7 +1,7 @@
 <!-- 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 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 2a6 6 0 1 0 6 6 6.007 6.007 0 0 0-6-6zm0 11a5 5 0 1 1 5-5 5.006 5.006 0 0 1-5 5z"></path>
-  <path d="M6.75 4.969A.5.5 0 0 0 6 5.4v5.2a.5.5 0 0 0 .75.433l4.5-2.6a.5.5 0 0 0 0-.866z"></path>
+  <path d="M10.98.574a1 1 0 0 0-.746 1.856A6.034 6.034 0 1 1 3 4.721V6a.5.5 0 0 0 1 0V2.5a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0 0 1h1.262A8 8 0 1 0 10.98.574z"/>
+  <path d="M6.494 12.137l5.672-3.274a1 1 0 0 0 0-1.726L6.494 3.863A1 1 0 0 0 5 4.726v6.548a1 1 0 0 0 1.494.863z"/>
 </svg>