From 43caa48ecba88a60b7b0b84d19d928ada8b22b09 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Thu, 26 Apr 2018 06:17:52 +0200 Subject: Bug 1038811 - Push Notifications - Firefox front end changes for preferences, and permission notification --- application/palemoon/themes/linux/Push-16.png | Bin 0 -> 606 bytes application/palemoon/themes/linux/Push-64.png | Bin 0 -> 8056 bytes application/palemoon/themes/linux/browser.css | 8 ++++++++ application/palemoon/themes/linux/jar.mn | 2 ++ .../themes/linux/preferences/aboutPermissions.css | 3 +++ 5 files changed, 13 insertions(+) create mode 100644 application/palemoon/themes/linux/Push-16.png create mode 100644 application/palemoon/themes/linux/Push-64.png (limited to 'application/palemoon/themes/linux') diff --git a/application/palemoon/themes/linux/Push-16.png b/application/palemoon/themes/linux/Push-16.png new file mode 100644 index 000000000..082b17781 Binary files /dev/null and b/application/palemoon/themes/linux/Push-16.png differ diff --git a/application/palemoon/themes/linux/Push-64.png b/application/palemoon/themes/linux/Push-64.png new file mode 100644 index 000000000..6e09ab9c3 Binary files /dev/null and b/application/palemoon/themes/linux/Push-64.png differ diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css index 4f4964db8..0be53ca26 100644 --- a/application/palemoon/themes/linux/browser.css +++ b/application/palemoon/themes/linux/browser.css @@ -1169,6 +1169,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } +.popup-notification-icon[popupid="push"] { + list-style-image: url(chrome://browser/skin/Push-64.png); +} + .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-progress"], .popup-notification-icon[popupid="addon-install-cancelled"], @@ -1288,6 +1292,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } +#push-notification-icon { + list-style-image: url(chrome://browser/skin/Push-16.png); +} + #addons-notification-icon { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index 7e67d0129..d1c6d4013 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -23,6 +23,8 @@ browser.jar: * skin/classic/browser/engineManager.css skin/classic/browser/Geolocation-16.png skin/classic/browser/Geolocation-64.png + skin/classic/browser/Push-16.png + skin/classic/browser/Push-64.png skin/classic/browser/Go-arrow.png skin/classic/browser/identity.png skin/classic/browser/imagedocument.png diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/preferences/aboutPermissions.css index 406568831..a642b385f 100644 --- a/application/palemoon/themes/linux/preferences/aboutPermissions.css +++ b/application/palemoon/themes/linux/preferences/aboutPermissions.css @@ -98,6 +98,9 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } +.pref-icon[type="push"] { + list-style-image: url(chrome://browser/skin/Push-64.png); +} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } -- cgit v1.2.3 From d6213d3f057e902316ff67b9774e349573bde90f Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Thu, 26 Apr 2018 09:54:20 +0200 Subject: Bug 1192458, Part 1 - Consolidate push and desktop notification permissions --- application/palemoon/themes/linux/jar.mn | 2 -- application/palemoon/themes/linux/preferences/aboutPermissions.css | 3 --- 2 files changed, 5 deletions(-) (limited to 'application/palemoon/themes/linux') diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index d1c6d4013..7e67d0129 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -23,8 +23,6 @@ browser.jar: * skin/classic/browser/engineManager.css skin/classic/browser/Geolocation-16.png skin/classic/browser/Geolocation-64.png - skin/classic/browser/Push-16.png - skin/classic/browser/Push-64.png skin/classic/browser/Go-arrow.png skin/classic/browser/identity.png skin/classic/browser/imagedocument.png diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/preferences/aboutPermissions.css index a642b385f..406568831 100644 --- a/application/palemoon/themes/linux/preferences/aboutPermissions.css +++ b/application/palemoon/themes/linux/preferences/aboutPermissions.css @@ -98,9 +98,6 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.pref-icon[type="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } -- cgit v1.2.3 From d49d212c38592c68c3e217dcf8bbe6f3ee54ecbf Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Thu, 26 Apr 2018 10:07:36 +0200 Subject: Bug 1192458, Part 2 - New icon for consolidated notification permission --- application/palemoon/themes/linux/browser.css | 13 +++++++++++- application/palemoon/themes/linux/jar.mn | 4 ++-- .../palemoon/themes/linux/notification-16.png | Bin 610 -> 0 bytes .../palemoon/themes/linux/notification-64.png | Bin 3373 -> 0 bytes .../themes/linux/preferences/aboutPermissions.css | 2 +- .../themes/linux/web-notifications-icon.svg | 15 ++++++++++++++ .../themes/linux/web-notifications-tray.svg | 23 +++++++++++++++++++++ 7 files changed, 53 insertions(+), 4 deletions(-) delete mode 100644 application/palemoon/themes/linux/notification-16.png delete mode 100644 application/palemoon/themes/linux/notification-64.png create mode 100644 application/palemoon/themes/linux/web-notifications-icon.svg create mode 100644 application/palemoon/themes/linux/web-notifications-tray.svg (limited to 'application/palemoon/themes/linux') diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css index 0be53ca26..131a63a90 100644 --- a/application/palemoon/themes/linux/browser.css +++ b/application/palemoon/themes/linux/browser.css @@ -1382,7 +1382,18 @@ toolbar[iconsize="small"] #webrtc-status-button { .web-notifications-notification-icon, #web-notifications-notification-icon { - list-style-image: url(chrome://browser/skin/notification-16.png); + list-style-image: url(chrome://browser/skin/web-notifications-tray.svg); + -moz-image-region: rect(0, 16px, 16px, 0); +} + +.web-notifications-notification-icon:hover, +#web-notifications-notification-icon:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +.web-notifications-notification-icon:hover:active, +#web-notifications-notification-icon:hover:active { + -moz-image-region: rect(0, 48px, 16px, 32px); } #pointerLock-notification-icon { diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index 7e67d0129..3c2ac406e 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -36,8 +36,6 @@ browser.jar: skin/classic/browser/mixed-content-blocked-64.png skin/classic/browser/monitor.png skin/classic/browser/monitor_16-10.png - skin/classic/browser/notification-16.png - skin/classic/browser/notification-64.png * skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png skin/classic/browser/page-livemarks.png @@ -54,6 +52,8 @@ browser.jar: skin/classic/browser/Toolbar.png skin/classic/browser/Toolbar-small.png skin/classic/browser/urlbar-arrow.png + skin/classic/browser/web-notifications-icon.svg + skin/classic/browser/web-notifications-tray.svg #ifdef MOZ_WEBRTC skin/classic/browser/webRTC-shareDevice-16.png skin/classic/browser/webRTC-shareDevice-64.png diff --git a/application/palemoon/themes/linux/notification-16.png b/application/palemoon/themes/linux/notification-16.png deleted file mode 100644 index 6b2df7341..000000000 Binary files a/application/palemoon/themes/linux/notification-16.png and /dev/null differ diff --git a/application/palemoon/themes/linux/notification-64.png b/application/palemoon/themes/linux/notification-64.png deleted file mode 100644 index a01d0ab77..000000000 Binary files a/application/palemoon/themes/linux/notification-64.png and /dev/null differ diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/preferences/aboutPermissions.css index 406568831..224c88018 100644 --- a/application/palemoon/themes/linux/preferences/aboutPermissions.css +++ b/application/palemoon/themes/linux/preferences/aboutPermissions.css @@ -90,7 +90,7 @@ list-style-image: url(chrome://global/skin/icons/question-64.png); } .pref-icon[type="desktop-notification"] { - list-style-image: url(chrome://browser/skin/notification-64.png); + list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); } .pref-icon[type="install"] { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); diff --git a/application/palemoon/themes/linux/web-notifications-icon.svg b/application/palemoon/themes/linux/web-notifications-icon.svg new file mode 100644 index 000000000..f7186c727 --- /dev/null +++ b/application/palemoon/themes/linux/web-notifications-icon.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/application/palemoon/themes/linux/web-notifications-tray.svg b/application/palemoon/themes/linux/web-notifications-tray.svg new file mode 100644 index 000000000..314026a10 --- /dev/null +++ b/application/palemoon/themes/linux/web-notifications-tray.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + -- cgit v1.2.3