Hey John,
My understanding was that these would not be part of the theme. I will double check with Matthieu.
On Fri, Aug 15, 2014 at 2:46 PM, John Lenton <email address hidden> wrote:
> John Lenton has proposed merging lp:~chipaca/webapps-core/theme-icons into > lp:webapps-core. > > Commit message: > For those icons provided in an icon theme in both plain and symbolic > variants, use an icon name instead of providing and referring to the icon > ourselves. > > Requested reviews: > WebApps Team (webapps-team) > > For more details, see: > https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968 > > For those icons provided in an icon theme in both plain and symbolic > variants, use an icon name instead of providing and referring to the icon > ourselves. > > This allows the notifications (org.freedesktop.Notifications bubbles and > the messaging menu entries) for those webapps to use the symbolic variants > for the secondary icon. > -- > https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968 > You are subscribed to branch lp:webapps-core. > > === removed file 'webapp-amazon/amazon.png' > Binary files webapp-amazon/amazon.png 2013-09-17 17:49:08 +0000 and > webapp-amazon/amazon.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-amazon/manifest.json' > --- webapp-amazon/manifest.json 2014-08-11 12:07:56 +0000 > +++ webapp-amazon/manifest.json 2014-08-15 12:45:46 +0000 > @@ -11,6 +11,6 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-amazon", > "title": "webapp-amazon", > - "version": "1.0.9" > + "version": "1.0.10" > } > > > === modified file 'webapp-amazon/webapp-amazon.desktop' > --- webapp-amazon/webapp-amazon.desktop 2014-08-11 12:07:56 +0000 > +++ webapp-amazon/webapp-amazon.desktop 2014-08-15 12:45:46 +0000 > @@ -3,7 +3,7 @@ > Terminal=false > Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?:// > www.amazon.com/*,https?://s.amazon-adsystem.com/* > http://www.amazon.com/gp/aw %u > Name=Amazon > -Icon=./amazon.png > +Icon=amazon > X-Ubuntu-Touch=true > X-Ubuntu-Single-Instance=true > X-Ubuntu-Default-Department-ID=internet > > === removed file 'webapp-ebay/ebay.png' > Binary files webapp-ebay/ebay.png 2013-09-17 17:53:01 +0000 and > webapp-ebay/ebay.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-ebay/manifest.json' > --- webapp-ebay/manifest.json 2014-08-11 12:07:56 +0000 > +++ webapp-ebay/manifest.json 2014-08-15 12:45:46 +0000 > @@ -11,6 +11,6 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-ebay", > "title": "webapp-ebay", > - "version": "1.0.11" > + "version": "1.0.12" > } > > > === modified file 'webapp-ebay/webapp-ebay.desktop' > --- webapp-ebay/webapp-ebay.desktop 2014-08-11 12:07:56 +0000 > +++ webapp-ebay/webapp-ebay.desktop 2014-08-15 12:45:46 +0000 > @@ -3,7 +3,7 @@ > Terminal=false > Exec=webapp-container --enable-back-forward > --webappUrlPatterns=https?://*.ebay.com/* http://m.ebay.com/ %u > Name=eBay > -Icon=./ebay.png > +Icon=ebay > X-Ubuntu-Touch=true > X-Ubuntu-Single-Instance=true > X-Ubuntu-Default-Department-ID=internet > > === removed file 'webapp-facebook/facebook.png' > Binary files webapp-facebook/facebook.png 2013-09-16 13:32:43 +0000 > and webapp-facebook/facebook.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-facebook/manifest.json' > --- webapp-facebook/manifest.json 2014-08-11 12:07:56 +0000 > +++ webapp-facebook/manifest.json 2014-08-15 12:45:46 +0000 > @@ -19,5 +19,5 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-facebook", > "title": "webapp-facebook", > - "version": "1.0.19" > + "version": "1.0.20" > } > > === modified file 'webapp-facebook/webapp-facebook.desktop' > --- webapp-facebook/webapp-facebook.desktop 2014-08-11 12:07:56 +0000 > +++ webapp-facebook/webapp-facebook.desktop 2014-08-15 12:45:46 +0000 > @@ -3,7 +3,7 @@ > Terminal=false > Exec=webapp-container --popup-redirection-url-prefix= > http://lm.facebook.com/l.php?u= --webapp='ZmFjZWJvb2s=' > --webappModelSearchPath=. https://m.facebook.com/ %u > Name=Facebook > -Icon=./facebook.png > +Icon=facebook > X-Ubuntu-Touch=true > X-Ubuntu-StageHint=SideStage > X-Ubuntu-Single-Instance=true > > === removed file 'webapp-gmail/gmail.png' > Binary files webapp-gmail/gmail.png 2014-08-13 20:01:50 +0000 and > webapp-gmail/gmail.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-gmail/manifest.json' > --- webapp-gmail/manifest.json 2014-08-13 20:01:50 +0000 > +++ webapp-gmail/manifest.json 2014-08-15 12:45:46 +0000 > @@ -16,6 +16,6 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-gmail", > "title": "webapp-gmail", > - "version": "1.0.18" > + "version": "1.0.19" > } > > > === modified file 'webapp-gmail/webapp-gmail.desktop' > --- webapp-gmail/webapp-gmail.desktop 2014-08-13 20:01:50 +0000 > +++ webapp-gmail/webapp-gmail.desktop 2014-08-15 12:45:46 +0000 > @@ -3,7 +3,7 @@ > Terminal=false > Exec=webapp-container --store-session-cookies > --webappUrlPatterns=https?://mail.google.*/*,https?://accounts.google.*/*,https?://www.google.*/accounts/* > https://mail.google.com/ %u > Name=Gmail > -Icon=./gmail.png > +Icon=gmail > X-Ubuntu-Touch=true > X-Ubuntu-Single-Instance=true > X-Ubuntu-Default-Department-ID=mail > > === modified file 'webapp-twitter/manifest.json' > --- webapp-twitter/manifest.json 2014-08-11 12:07:56 +0000 > +++ webapp-twitter/manifest.json 2014-08-15 12:45:46 +0000 > @@ -17,6 +17,6 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-twitter", > "title": "webapp-twitter", > - "version": "1.0.15" > + "version": "1.0.16" > } > > > === removed file 'webapp-twitter/twitter.png' > Binary files webapp-twitter/twitter.png 2013-09-13 10:35:33 +0000 and > webapp-twitter/twitter.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-twitter/webapp-twitter.desktop' > --- webapp-twitter/webapp-twitter.desktop 2014-08-11 12:07:56 +0000 > +++ webapp-twitter/webapp-twitter.desktop 2014-08-15 12:45:46 +0000 > @@ -3,7 +3,7 @@ > Terminal=false > Exec=webapp-container --store-session-cookies > --webappUrlPatterns=https?://mobile.twitter.com/* > https://mobile.twitter.com/session/new %u > Name=Twitter > -Icon=./twitter.png > +Icon=twitter > X-Ubuntu-Touch=true > X-Ubuntu-StageHint=SideStage > X-Ubuntu-Single-Instance=true > > === modified file 'webapp-ubuntuone/manifest.json' > --- webapp-ubuntuone/manifest.json 2014-03-31 17:30:39 +0000 > +++ webapp-ubuntuone/manifest.json 2014-08-15 12:45:46 +0000 > @@ -11,6 +11,6 @@ > "maintainer": "Webapps Team <email address hidden>", > "name": "com.ubuntu.developer.webapps.webapp-ubuntuone", > "title": "webapp-ubuntuone", > - "version": "1.0.6" > + "version": "1.0.7" > } > > > === removed file 'webapp-ubuntuone/ubuntuone.png' > Binary files webapp-ubuntuone/ubuntuone.png 2013-09-17 18:45:01 +0000 > and webapp-ubuntuone/ubuntuone.png 1970-01-01 00:00:00 +0000 differ > === modified file 'webapp-ubuntuone/webapp-ubuntuone.desktop' > --- webapp-ubuntuone/webapp-ubuntuone.desktop 2014-03-28 20:46:10 +0000 > +++ webapp-ubuntuone/webapp-ubuntuone.desktop 2014-08-15 12:45:46 +0000 > @@ -3,6 +3,6 @@ > Terminal=false > Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?:// > one.ubuntu.com/*,https?://login.ubuntu.com/* https://one.ubuntu.com/ > Name=Ubuntu One > -Icon=./ubuntuone.png > +Icon=ubuntuone > X-Ubuntu-Touch=true > X-Ubuntu-Single-Instance=true > > >
« Back to merge proposal
Hey John,
My understanding was that these would not be part of the theme. I will
double check with Matthieu.
On Fri, Aug 15, 2014 at 2:46 PM, John Lenton <email address hidden>
wrote:
> John Lenton has proposed merging lp:~chipaca/webapps-core/theme-icons into /code.launchpad .net/~chipaca/ webapps- core/theme- icons/+ merge/230968 p.Notifications bubbles and /code.launchpad .net/~chipaca/ webapps- core/theme- icons/+ merge/230968 amazon/ amazon. png' amazon/ amazon. png 2013-09-17 17:49:08 +0000 and amazon/ amazon. png 1970-01-01 00:00:00 +0000 differ amazon/ manifest. json' amazon/ manifest. json 2014-08-11 12:07:56 +0000 amazon/ manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- amazon" , amazon/ webapp- amazon. desktop' amazon/ webapp- amazon. desktop 2014-08-11 12:07:56 +0000 amazon/ webapp- amazon. desktop 2014-08-15 12:45:46 +0000 container --enable- back-forward --webappUrlPatt erns=https? :// com/*,https? ://s.amazon- adsystem. com/* www.amazon. com/gp/ aw %u Single- Instance= true Default- Department- ID=internet ebay/ebay. png' ebay/ebay. png 2013-09-17 17:53:01 +0000 and ebay/ebay. png 1970-01-01 00:00:00 +0000 differ ebay/manifest. json' ebay/manifest. json 2014-08-11 12:07:56 +0000 ebay/manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- ebay", ebay/webapp- ebay.desktop' ebay/webapp- ebay.desktop 2014-08-11 12:07:56 +0000 ebay/webapp- ebay.desktop 2014-08-15 12:45:46 +0000 container --enable- back-forward erns=https? ://*.ebay. com/* http:// m.ebay. com/ %u Single- Instance= true Default- Department- ID=internet facebook/ facebook. png' facebook/ facebook. png 2013-09-16 13:32:43 +0000 facebook/ facebook. png 1970-01-01 00:00:00 +0000 differ facebook/ manifest. json' facebook/ manifest. json 2014-08-11 12:07:56 +0000 facebook/ manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- facebook" , facebook/ webapp- facebook. desktop' facebook/ webapp- facebook. desktop 2014-08-11 12:07:56 +0000 facebook/ webapp- facebook. desktop 2014-08-15 12:45:46 +0000 container --popup- redirection- url-prefix= lm.facebook. com/l.php? u= --webapp= 'ZmFjZWJvb2s= ' archPath= . https:/ /m.facebook. com/ %u /facebook. png StageHint= SideStage Single- Instance= true gmail/gmail. png' gmail/gmail. png 2014-08-13 20:01:50 +0000 and gmail/gmail. png 1970-01-01 00:00:00 +0000 differ gmail/manifest. json' gmail/manifest. json 2014-08-13 20:01:50 +0000 gmail/manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- gmail", gmail/webapp- gmail.desktop' gmail/webapp- gmail.desktop 2014-08-13 20:01:50 +0000 gmail/webapp- gmail.desktop 2014-08-15 12:45:46 +0000 container --store- session- cookies erns=https? ://mail. google. */*,https? ://accounts. google. */*,https? ://www. google. */accounts/ * /mail.google. com/ %u Single- Instance= true Default- Department- ID=mail twitter/ manifest. json' twitter/ manifest. json 2014-08-11 12:07:56 +0000 twitter/ manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- twitter" , twitter/ twitter. png' twitter/ twitter. png 2013-09-13 10:35:33 +0000 and twitter/ twitter. png 1970-01-01 00:00:00 +0000 differ twitter/ webapp- twitter. desktop' twitter/ webapp- twitter. desktop 2014-08-11 12:07:56 +0000 twitter/ webapp- twitter. desktop 2014-08-15 12:45:46 +0000 container --store- session- cookies erns=https? ://mobile. twitter. com/* /mobile. twitter. com/session/ new %u StageHint= SideStage Single- Instance= true ubuntuone/ manifest. json' ubuntuone/ manifest. json 2014-03-31 17:30:39 +0000 ubuntuone/ manifest. json 2014-08-15 12:45:46 +0000 developer. webapps. webapp- ubuntuone" , ubuntuone/ ubuntuone. png' ubuntuone/ ubuntuone. png 2013-09-17 18:45:01 +0000 ubuntuone/ ubuntuone. png 1970-01-01 00:00:00 +0000 differ ubuntuone/ webapp- ubuntuone. desktop' ubuntuone/ webapp- ubuntuone. desktop 2014-03-28 20:46:10 +0000 ubuntuone/ webapp- ubuntuone. desktop 2014-08-15 12:45:46 +0000 container --enable- back-forward --webappUrlPatt erns=https? :// com/*,https? ://login. ubuntu. com/* https:/ /one.ubuntu. com/ /ubuntuone. png Single- Instance= true
> lp:webapps-core.
>
> Commit message:
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> Requested reviews:
> WebApps Team (webapps-team)
>
> For more details, see:
> https:/
>
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> This allows the notifications (org.freedeskto
> the messaging menu entries) for those webapps to use the symbolic variants
> for the secondary icon.
> --
> https:/
> You are subscribed to branch lp:webapps-core.
>
> === removed file 'webapp-
> Binary files webapp-
> webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -11,6 +11,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-amazon",
> - "version": "1.0.9"
> + "version": "1.0.10"
> }
>
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-
> www.amazon.
> http://
> Name=Amazon
> -Icon=./amazon.png
> +Icon=amazon
> X-Ubuntu-Touch=true
> X-Ubuntu-
> X-Ubuntu-
>
> === removed file 'webapp-
> Binary files webapp-
> webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -11,6 +11,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-ebay",
> - "version": "1.0.11"
> + "version": "1.0.12"
> }
>
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-
> --webappUrlPatt
> Name=eBay
> -Icon=./ebay.png
> +Icon=ebay
> X-Ubuntu-Touch=true
> X-Ubuntu-
> X-Ubuntu-
>
> === removed file 'webapp-
> Binary files webapp-
> and webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -19,5 +19,5 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-facebook",
> - "version": "1.0.19"
> + "version": "1.0.20"
> }
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-
> http://
> --webappModelSe
> Name=Facebook
> -Icon=.
> +Icon=facebook
> X-Ubuntu-Touch=true
> X-Ubuntu-
> X-Ubuntu-
>
> === removed file 'webapp-
> Binary files webapp-
> webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -16,6 +16,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-gmail",
> - "version": "1.0.18"
> + "version": "1.0.19"
> }
>
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-
> --webappUrlPatt
> https:/
> Name=Gmail
> -Icon=./gmail.png
> +Icon=gmail
> X-Ubuntu-Touch=true
> X-Ubuntu-
> X-Ubuntu-
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -17,6 +17,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-twitter",
> - "version": "1.0.15"
> + "version": "1.0.16"
> }
>
>
> === removed file 'webapp-
> Binary files webapp-
> webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-
> --webappUrlPatt
> https:/
> Name=Twitter
> -Icon=./twitter.png
> +Icon=twitter
> X-Ubuntu-Touch=true
> X-Ubuntu-
> X-Ubuntu-
>
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -11,6 +11,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.
> "title": "webapp-ubuntuone",
> - "version": "1.0.6"
> + "version": "1.0.7"
> }
>
>
> === removed file 'webapp-
> Binary files webapp-
> and webapp-
> === modified file 'webapp-
> --- webapp-
> +++ webapp-
> @@ -3,6 +3,6 @@
> Terminal=false
> Exec=webapp-
> one.ubuntu.
> Name=Ubuntu One
> -Icon=.
> +Icon=ubuntuone
> X-Ubuntu-Touch=true
> X-Ubuntu-
>
>
>