Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 893297 - Icon problem when installing an app from within another app (yo dawg). r=Mossop

Browse Source 
--HG--
rename : browser/themes/linux/webapps-16.png => toolkit/themes/linux/global/icons/webapps-16.png
rename : browser/themes/linux/webapps-64.png => toolkit/themes/linux/global/icons/webapps-64.png
rename : browser/themes/osx/webapps-16.png => toolkit/themes/osx/global/icons/webapps-16.png
rename : browser/themes/osx/webapps-16@2x.png => toolkit/themes/osx/global/icons/webapps-16@2x.png
rename : browser/themes/osx/webapps-64.png => toolkit/themes/osx/global/icons/webapps-64.png
rename : browser/themes/windows/webapps-16.png => toolkit/themes/windows/global/icons/webapps-16.png
rename : browser/themes/windows/webapps-64.png => toolkit/themes/windows/global/icons/webapps-64.png
This commit is contained in:
Marco Castelluccio 2013-07-29 12:17:57 -04:00
parent 401241c946
commit c40bbaf264
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/themes/linux/browser.css
View File

@ -1185,7 +1185,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
}
.popup-notification-icon[popupid="webapps-install"] {
list-style-image: url(chrome://browser/skin/webapps-64.png);
list-style-image: url(chrome://global/skin/icons/webapps-64.png);
}
.popup-notification-icon[popupid="mixed-content-blocked"] {
@ -1265,7 +1265,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
}
#webapps-notification-icon {
list-style-image: url(chrome://browser/skin/webapps-16.png);
list-style-image: url(chrome://global/skin/icons/webapps-16.png);
}
#plugins-notification-icon {

2
browser/themes/linux/jar.mn
View File

@ -233,8 +233,6 @@ browser.jar:
skin/classic/browser/syncQuota.css
skin/classic/browser/syncProgress.css
#endif
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-64.png
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)

6
browser/themes/osx/browser.css
View File

@ -3150,12 +3150,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
.webapps-notification-icon,
#webapps-notification-icon {
list-style-image: url(chrome://browser/skin/webapps-16.png);
list-style-image: url(chrome://global/skin/icons/webapps-16.png);
}
@media (min-resolution: 2dppx) {
.webapps-notification-icon,
#webapps-notification-icon {
list-style-image: url(chrome://browser/skin/webapps-16@2x.png);
list-style-image: url(chrome://global/skin/icons/webapps-16@2x.png);
}
}
@ -3403,7 +3403,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
}
.popup-notification-icon[popupid="webapps-install"] {
list-style-image: url(chrome://browser/skin/webapps-64.png);
list-style-image: url(chrome://global/skin/icons/webapps-64.png);
}
.popup-notification-icon[popupid="mixed-content-blocked"] {

3
browser/themes/osx/jar.mn
View File

@ -331,9 +331,6 @@ browser.jar:
skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png)
skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png)
skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png)
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-16@2x.png
skin/classic/browser/webapps-64.png
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)

4
browser/themes/windows/browser.css
View File

@ -2455,7 +2455,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
}
.popup-notification-icon[popupid="webapps-install"] {
list-style-image: url(chrome://browser/skin/webapps-64.png);
list-style-image: url(chrome://global/skin/icons/webapps-64.png);
}
.popup-notification-icon[popupid="mixed-content-blocked"] {
@ -2533,7 +2533,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
}
#webapps-notification-icon {
list-style-image: url(chrome://browser/skin/webapps-16.png);
list-style-image: url(chrome://global/skin/icons/webapps-16.png);
}
#plugins-notification-icon {

4
browser/themes/windows/jar.mn
View File

@ -70,8 +70,6 @@ browser.jar:
skin/classic/browser/urlbar-arrow.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-history-dropmarker.png
skin/classic/browser/webapps-16.png
skin/classic/browser/webapps-64.png
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
@ -327,8 +325,6 @@ browser.jar:
skin/classic/aero/browser/urlbar-arrow.png
skin/classic/aero/browser/urlbar-popup-blocked.png
skin/classic/aero/browser/urlbar-history-dropmarker.png
skin/classic/aero/browser/webapps-16.png
skin/classic/aero/browser/webapps-64.png
skin/classic/aero/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/aero/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/aero/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)

0
browser/themes/linux/webapps-16.png → toolkit/themes/linux/global/icons/webapps-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 475 B

0
browser/themes/linux/webapps-64.png → toolkit/themes/linux/global/icons/webapps-64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

2
toolkit/themes/linux/global/jar.mn
View File

@ -51,4 +51,6 @@ toolkit.jar:
+ skin/classic/global/icons/resizer.png (icons/resizer.png)
+ skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
+ skin/classic/global/icons/wrap.png (icons/wrap.png)
+ skin/classic/global/icons/webapps-16.png (icons/webapps-16.png)
+ skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)
+ skin/classic/global/toolbar/spring.png (toolbar/spring.png)

0
browser/themes/osx/webapps-16.png → toolkit/themes/osx/global/icons/webapps-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

0
browser/themes/osx/webapps-16@2x.png → toolkit/themes/osx/global/icons/webapps-16@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 481 B

0
browser/themes/osx/webapps-64.png → toolkit/themes/osx/global/icons/webapps-64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

3
toolkit/themes/osx/global/jar.mn
View File

@ -142,6 +142,9 @@ toolkit.jar:
skin/classic/global/icons/question-64.png (icons/question-64.png)
skin/classic/global/icons/question-large.png (icons/question-large.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
skin/classic/global/icons/webapps-16.png (icons/webapps-16.png)
skin/classic/global/icons/webapps-16@2x.png (icons/webapps-16@2x.png)
skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)
skin/classic/global/inContentUI/background-texture.png (inContentUI/background-texture.png)
skin/classic/global/notification/close.png (notification/close.png)
skin/classic/global/notification/critical-bar-background.png (notification/critical-bar-background.png)

0
browser/themes/windows/webapps-16.png → toolkit/themes/windows/global/icons/webapps-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

0
browser/themes/windows/webapps-64.png → toolkit/themes/windows/global/icons/webapps-64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

4
toolkit/themes/windows/global/jar.mn
View File

@ -143,6 +143,8 @@ toolkit.jar:
skin/classic/global/icons/warning-64.png (icons/warning-64.png)
skin/classic/global/icons/windowControls.png (icons/windowControls.png)
skin/classic/global/icons/wrap.png (icons/wrap.png)
skin/classic/global/icons/webapps-16.png (icons/webapps-16.png)
skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)
skin/classic/global/inContentUI/background-texture.png (inContentUI/background-texture.png)
skin/classic/global/media/TopLevelImageDocument.css (media/TopLevelImageDocument.css)
skin/classic/global/media/TopLevelVideoDocument.css (media/TopLevelVideoDocument.css)
@ -323,6 +325,8 @@ toolkit.jar:
skin/classic/aero/global/icons/warning-64.png (icons/warning-64-aero.png)
skin/classic/aero/global/icons/windowControls.png (icons/windowControls-aero.png)
skin/classic/aero/global/icons/wrap.png (icons/wrap-aero.png)
skin/classic/aero/global/icons/webapps-16.png (icons/webapps-16.png)
skin/classic/aero/global/icons/webapps-64.png (icons/webapps-64.png)
skin/classic/aero/global/inContentUI/background-texture.png (inContentUI/background-texture.png)
skin/classic/aero/global/media/TopLevelImageDocument.css (media/TopLevelImageDocument.css)
skin/classic/aero/global/media/TopLevelVideoDocument.css (media/TopLevelVideoDocument.css)

4
toolkit/webapps/WebappsIconHelpers.js
View File

@ -17,12 +17,12 @@
*/
function getBiggestIconURL(aIcons) {
if (!aIcons) {
return "chrome://browser/skin/webapps-64.png";
return "chrome://global/skin/icons/webapps-64.png";
}
let iconSizes = Object.keys(aIcons);
if (iconSizes.length == 0) {
return "chrome://browser/skin/webapps-64.png";
return "chrome://global/skin/icons/webapps-64.png";
}
iconSizes.sort(function(a, b) a - b);
return aIcons[iconSizes.pop()];