author | Johann Hofmann <jhofmann@mozilla.com> |
Thu, 14 Jul 2016 13:58:54 +0200 | |
changeset 389447 | a5a2837e3fed3cfdf6be39fa756e3be7e1257190 |
parent 389446 | 65524ee7219ac01b54b89836b67d70ea9d818dbc |
child 389494 | efa58477381d54e2d0bd1d89c2d9210a3714e143 |
push id | 23404 |
push user | mail@johann-hofmann.com |
push date | Tue, 19 Jul 2016 09:02:12 +0000 |
reviewers | paolo |
bugs | 1285891 |
milestone | 50.0a1 |
--- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -61,17 +61,17 @@ skin/classic/browser/heartbeat-star-lit.svg (../shared/heartbeat-star-lit.svg) skin/classic/browser/heartbeat-star-off.svg (../shared/heartbeat-star-off.svg) skin/classic/browser/identity-icon.svg (../shared/identity-block/identity-icon.svg) skin/classic/browser/identity-not-secure.svg (../shared/identity-block/identity-not-secure.svg) skin/classic/browser/identity-secure.svg (../shared/identity-block/identity-secure.svg) skin/classic/browser/identity-mixed-passive-loaded.svg (../shared/identity-block/identity-mixed-passive-loaded.svg) skin/classic/browser/identity-mixed-active-loaded.svg (../shared/identity-block/identity-mixed-active-loaded.svg) skin/classic/browser/info.svg (../shared/info.svg) - skin/classic/browser/permissions.svg (../shared/permissions.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/tracking-protection-disabled-16.svg (../shared/identity-block/tracking-protection-disabled-16.svg) skin/classic/browser/newtab/close.png (../shared/newtab/close.png) skin/classic/browser/newtab/controls.svg (../shared/newtab/controls.svg) skin/classic/browser/newtab/whimsycorn.png (../shared/newtab/whimsycorn.png) skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico) skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) @@ -122,22 +122,16 @@ skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg) skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg) skin/classic/browser/favicon-search-16.svg (../shared/favicon-search-16.svg) skin/classic/browser/icon-search-64.svg (../shared/incontent-icons/icon-search-64.svg) skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg) skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png) skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png) skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg) - skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) - skin/classic/browser/notification-pluginNormal@2x.png (../shared/plugins/notification-pluginNormal@2x.png) - skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) - skin/classic/browser/notification-pluginAlert@2x.png (../shared/plugins/notification-pluginAlert@2x.png) - skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) - skin/classic/browser/notification-pluginBlocked@2x.png (../shared/plugins/notification-pluginBlocked@2x.png) skin/classic/browser/webRTC-camera-white-16.png (../shared/webrtc/camera-white-16.png) skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png) skin/classic/browser/webRTC-screen-white-16.png (../shared/webrtc/screen-white-16.png) skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png) skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png) skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png) skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png) skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
--- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -47,16 +47,17 @@ The first two selectors are used by socialchat.xml (bug 1275558). */ .webRTC-sharingDevices-notification-icon, .webRTC-sharingMicrophone-notification-icon, .camera-icon, .geo-icon, .indexedDB-icon, .login-icon, .microphone-icon, +.plugin-icon, .pointerLock-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="pointerLock"], @@ -76,124 +77,124 @@ .webRTC-sharingDevices-notification-icon, .webRTC-sharingMicrophone-notification-icon, .in-use { fill: #fea01b; } .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#desktop-notification); + list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification); } .desktop-notification-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#desktop-notification-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/permissions.svg#geo-osx); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-osx); %elif defined(MOZ_WIDGET_GTK) - list-style-image: url(chrome://browser/skin/permissions.svg#geo-linux); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-linux); %else - list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows); %endif } .geo-icon.blocked { %ifdef XP_MACOSX - list-style-image: url(chrome://browser/skin/permissions.svg#geo-osx-blocked); + 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/permissions.svg#geo-linux-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-linux-blocked); %else - list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-blocked); %endif } .popup-notification-icon[popupid="geolocation"] { %ifdef XP_MACOSX - list-style-image: url(chrome://browser/skin/permissions.svg#geo-osx); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-osx); %elif defined(MOZ_WIDGET_GTK) - list-style-image: url(chrome://browser/skin/permissions.svg#geo-linux-detailed); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-linux-detailed); %else - list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows-detailed); + list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-detailed); %endif } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .indexedDB-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#indexedDB); + list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB); } .indexedDB-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#indexedDB-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB-blocked); } .login-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#login); + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); } .popup-notification-icon[popupid="password"] { - list-style-image: url(chrome://browser/skin/permissions.svg#login-detailed); + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } #login-fill-notification-icon { /* Temporary solution until the capture and fill doorhangers are unified. */ transform: scaleX(-1); } /* The first selector is used by socialchat.xml (bug 1275558). */ .webRTC-sharingDevices-notification-icon, .camera-icon, .popup-notification-icon[popupid="webRTC-shareDevices"], .popup-notification-icon[popupid="webRTC-sharingDevices"] { - list-style-image: url(chrome://browser/skin/permissions.svg#camera); + list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } .camera-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#camera-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-blocked); } /* The first selector is used by socialchat.xml (bug 1275558). */ .webRTC-sharingMicrophone-notification-icon, .microphone-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#microphone); + list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone); } .microphone-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#microphone-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } .popup-notification-icon[popupid="webRTC-shareMicrophone"], .popup-notification-icon[popupid="webRTC-sharingMicrophone"] { - list-style-image: url(chrome://browser/skin/permissions.svg#microphone-detailed); + list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } .popup-notification-icon[popupid="webRTC-shareScreen"], .popup-notification-icon[popupid="webRTC-sharingScreen"], .screen-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#screen); + list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } .screen-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#screen-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } .popup-notification-icon[popupid="pointerLock"], .pointerLock-icon { - list-style-image: url(chrome://browser/skin/permissions.svg#pointerLock); + list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock); } .pointerLock-icon.blocked { - list-style-image: url(chrome://browser/skin/permissions.svg#pointerLock-blocked); + list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock-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/permissions.svg#popup"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); } /* EME */ .popup-notification-icon[popupid="drmContentPlaying"], .drm-icon { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } @@ -258,51 +259,24 @@ .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } /* PLUGINS */ .plugin-icon { - list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); -} - -.plugin-icon.plugin-hidden { - list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); + list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin); } .plugin-icon.plugin-blocked { - list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); -} - -.plugin-icon { - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked); + fill: #d92215; } -%ifdef XP_MACOSX -@media (min-resolution: 1.1dppx) { - .plugin-icon { - list-style-image: url(chrome://browser/skin/notification-pluginNormal@2x.png); - } - - .plugin-icon.plugin-hidden { - list-style-image: url(chrome://browser/skin/notification-pluginAlert@2x.png); - } - - .plugin-icon.plugin-blocked { - list-style-image: url(chrome://browser/skin/notification-pluginBlocked@2x.png); - } - - .plugin-icon { - -moz-image-region: rect(0, 32px, 32px, 0); - } -} -%endif - #notification-popup-box[hidden] { /* Override display:none to make the pluginBlockedNotification animation work when showing the notification repeatedly. */ display: -moz-box; visibility: collapse; } #plugins-notification-icon.plugin-blocked[showing] {
rename from browser/themes/shared/permissions.svg rename to browser/themes/shared/notification-icons.svg --- a/browser/themes/shared/permissions.svg +++ b/browser/themes/shared/notification-icons.svg @@ -28,16 +28,17 @@ <path id="geo-osx-icon" d="m 0,16 16,0 0,16 12,-28 z" /> <path id="geo-windows-icon" d="m 2,14 0,4 2,0 a 12,12 0 0 0 10,10 l 0,2 4,0 0,-2 a 12,12 0 0 0 10,-10 l 2,0 0,-4 -2,0 a 12,12 0 0 0 -10,-10 l 0,-2 -4,0 0,2 a 12,12 0 0 0 -10,10 z m 4,1.9 a 10,10 0 1 1 0,0.2 z m 4,0 a 6,6 0 1 1 0,0.2 z" /> <path id="geo-windows-detailed-icon" d="m 2,14.5 0,3 2,0.5 a 12,12 0 0 0 10,10 l 0.5,2 3,0 0.5,-2 a 12,12 0 0 0 10,-10 l 2,-0.5 0,-3 -2,-0.5 a 12,12 0 0 0 -10,-10 l -0.5,-2 -3,0 -0.5,2 a 12,12 0 0 0 -10,10 z m 4,1.4 a 10,10 0 1 1 0,0.2 z m 3,0 a 7,7 0 1 1 0,0.2 z" /> <path id="indexedDB-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 2,0 0,-4 -2,0 0,-16 20,0 0,16 -2,0 0,4 2,0 a 4,4 0 0 0 4,-4 l 0,-16 a 4,4 0 0 0 -4,-4 l -20,0 a 4,4 0 0 0 -4,4 z m 8,-2 6,7 6,-7 -4,0 0,-8 -4,0 0,8 z" /> <path id="login-icon" d="m 2,26 0,4 6,0 0,-2 2,0 0,-2 1,0 0,-1 2,0 0,-3 2,0 2.5,-2.5 1.5,1.5 3,-3 a 8,8 0 1 0 -8,-8 l -3,3 2,2 z m 20,-18.1 a 2,2 0 1 1 0,0.2 z" /> <path id="login-detailed-icon" d="m 1,27 0,3.5 a 0.5,0.5 0 0 0 0.5,0.5 l 5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1.5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-2 2,0 2.5,-2.5 q 0.5,-0.5 1,0 l 1,1 c 0.5,0.5 1,0.5 1.5,-0.5 l 1,-2 a 9,9 0 1 0 -8,-8 l -2,1 c -1,0.5 -1,1 -0.5,1.5 l 1.5,1.5 q 0.5,0.5 0,1 z m 21,-19.1 a 2,2 0 1 1 0,0.2 z" /> <path id="microphone-icon" d="m 8,14 0,4 a 8,8 0 0 0 6,7.7 l 0,2.3 -2,0 a 2,2 0 0 0 -2,2 l 12,0 a 2,2 0 0 0 -2,-2 l -2,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 -2,0 0,4 a 6,6 0 0 1 -12,0 l 0,-4 z m 4,4 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" /> <path id="microphone-detailed-icon" d="m 8,18 a 8,8 0 0 0 6,7.7 l 0,2.3 -1,0 a 3,2 0 0 0 -3,2 l 12,0 a 3,2 0 0 0 -3,-2 l -1,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 a 1,1 0 0 0 -2,0 l 0,4 a 6,6 0 0 1 -12,0 l 0,-4 a 1,1 0 0 0 -2,0 z m 4,0 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" /> + <path id="plugin-icon" d="m 2,26 a 2,2 0 0 0 2,2 l 24,0 a 2,2 0 0 0 2,-2 l 0,-16 a 2,2 0 0 0 -2,-2 l -24,0 a 2,2 0 0 0 -2,2 z m 2,-20 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z m 14,0 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z" /> <path id="pointerLock-icon" d="m 8,24 6,-5 5,10 4,-2 -5,-10 7,-1 -17,-14 z" /> <path id="popup-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 8,0 a 10,10 0 0 1 -2,-4 l -4,0 a 2,2 0 0 1 -2,-2 l 0,-12 18,0 0,2 a 10,10 0 0 1 4,2 l 0,-8 a 4,4 0 0 0 -4,-4 l -18,0 a 4,4 0 0 0 -4,4 z m 12,-2.1 a 8,8 0 1 1 0,0.2 m 10.7,-4.3 a 5,5 0 0 0 -6.9,6.9 z m -5.4,8.4 a 5,5 0 0 0 6.9,-6.9 z" /> <path id="screen-icon" d="m 2,18 a 2,2 0 0 0 2,2 l 2,0 0,-6 a 4,4 0 0 1 4,-4 l 14,0 0,-6 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z m 6,10 a 2,2 0 0 0 2,2 l 18,0 a 2,2 0 0 0 2,-2 l 0,-14 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z" /> <clipPath id="clip"> <path d="m 0,0 0,31 31,-31 z m 6,32 26,0 0,-26 z"/> </clipPath> </defs> @@ -56,16 +57,18 @@ <use id="geo-windows-detailed" xlink:href="#geo-windows-detailed-icon" /> <use id="indexedDB" xlink:href="#indexedDB-icon" /> <use id="indexedDB-blocked" class="blocked" xlink:href="#indexedDB-icon" /> <use id="login" xlink:href="#login-icon" /> <use id="login-detailed" xlink:href="#login-detailed-icon" /> <use id="microphone" xlink:href="#microphone-icon" /> <use id="microphone-blocked" class="blocked" xlink:href="#microphone-icon" /> <use id="microphone-detailed" xlink:href="#microphone-detailed-icon" /> + <use id="plugin" xlink:href="#plugin-icon" /> + <use id="plugin-blocked" class="blocked" xlink:href="#plugin-icon" /> <use id="pointerLock" xlink:href="#pointerLock-icon" /> <use id="pointerLock-blocked" class="blocked" xlink:href="#pointerLock-icon" /> <use id="popup" xlink:href="#popup-icon" /> <use id="screen" xlink:href="#screen-icon" /> <use id="screen-blocked" class="blocked" xlink:href="#screen-icon" /> <path id="strikeout" d="m 2,28 2,2 26,-26 -2,-2 z"/> </svg>
deleted file mode 100644 index 7492fdd8670488b9b510d913424dcc46f5e1ab57..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index f3359969b6f30fb090f424961024a72435e01b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index e2e9489004eb7cd0661d6ebf8d3a7be4869fddca..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index 5126be01f08bfd06884278f6527e0e43f9029534..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index 979e92b7f51d98aebc1ce4b6255954e6ee8a12dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
deleted file mode 100644 index c081bbb475f9b60070fcae3817967da05f1b533b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001
--- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -109,25 +109,25 @@ .tab-sharing-icon-overlay { /* 16px of the icon + 6px of margin-inline-end of .tab-icon-image */ margin-inline-start: -22px; position: relative; } .tab-sharing-icon-overlay[sharing="camera"] { - list-style-image: url("chrome://browser/skin/permissions.svg#camera"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#camera"); } .tab-sharing-icon-overlay[sharing="microphone"] { - list-style-image: url("chrome://browser/skin/permissions.svg#microphone"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#microphone"); } .tab-sharing-icon-overlay[sharing="screen"] { - list-style-image: url("chrome://browser/skin/permissions.svg#screen"); + list-style-image: url("chrome://browser/skin/notification-icons.svg#screen"); } .tab-sharing-icon-overlay[sharing] { filter: url("chrome://browser/skin/filters.svg#fill"); fill: rgb(224, 41, 29); } .tab-icon-overlay {