Skip to content
This repository has been archived by the owner on Feb 29, 2020. It is now read-only.

Commit

Permalink
fix (systemaddon): #3111 use screenshots instead of icons for default…
Browse files Browse the repository at this point in the history
… sites
  • Loading branch information
rlr authored and k88hudson committed Aug 16, 2017
1 parent 6395845 commit c33cea4
Show file tree
Hide file tree
Showing 26 changed files with 110 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -17,6 +17,5 @@ common/vendor.js
*.update.rdf
system-addon/data/content/activity-stream.bundle.js
system-addon/data/content/activity-stream.css
system-addon/data/content/tippytop
system-addon/data/locales.json
pocket.json
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -267,7 +267,7 @@
"tippymc:manifest": "cpx \"node_modules/tippy-top-sites/top_sites.json\" system-addon/data/content/tippytop",
"tippymc:images": "cpx \"node_modules/tippy-top-sites/images/**/*\" system-addon/data/content/tippytop/images",
"buildmc": "npm-run-all buildmc:*",
"prebuildmc": "npm run cleanmc && npm run tippymc",
"prebuildmc": "npm run cleanmc",
"buildmc:webpack": "webpack --config webpack.system-addon.config.js",
"buildmc:css": "node-sass system-addon/content-src/activity-stream.scss -o system-addon/data/content",
"buildmc:locales": "pontoon-to-json --src locales --dest system-addon/data",
Expand Down
Expand Up @@ -4,7 +4,7 @@
$top-sites-title-height: 30px;
$top-sites-vertical-space: 18px;
$screenshot-size: cover;
$tippy-top-size: 80px;
$tippy-top-size: 96px;

list-style: none;
margin: 0;
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 107 additions & 0 deletions system-addon/data/content/tippytop/top_sites.json
@@ -0,0 +1,107 @@
[
{
"title": "aliexpress",
"url": "https://www.aliexpress.com/",
"image_url": "aliexpress-com@2x.png"
},
{
"title": "allegro",
"url": "https://www.allegro.pl/",
"image_url": "allegro-pl@2x.png"
},
{
"title": "amazon",
"url": "https://www.amazon.ca/",
"image_url": "amazon-ca@2x.png"
},
{
"title": "amazon",
"url": "https://www.amazon.co.uk/",
"image_url": "amazon-uk@2x.png"
},
{
"title": "amazon",
"url": "https://www.amazon.com/",
"image_url": "amazon-com@2x.png"
},
{
"title": "amazon",
"url": "https://www.amazon.de/",
"image_url": "amazon-de@2x.png"
},
{
"title": "amazon",
"url": "https://www.amazon.fr/",
"image_url": "amazon-fr@2x.png"
},
{
"title": "avito",
"url": "https://www.avito.ru/",
"image_url": "avito@2x.png"
},
{
"title": "bbc",
"url": "https://www.bbc.co.uk/",
"image_url": "bbc-uk@2x.png"
},
{
"title": "ebay",
"urls": ["https://www.ebay.com", "https://www.ebay.co.uk/"],
"image_url": "ebay@2x.png"
},
{
"title": "ebay",
"url": "https://ebay.de",
"image_url": "ebay-de@2x.png"
},
{
"title": "facebook",
"url": "https://www.facebook.com/",
"image_url": "facebook-com@2x.png"
},
{
"title": "leboncoin",
"url": "http://www.leboncoin.fr/",
"image_url": "leboncoin@2x.png"
},
{
"title": "ok",
"url": "https://www.ok.ru/",
"image_url": "ok@2x.png"
},
{
"title": "olx",
"url": "https://www.olx.pl/",
"image_url": "olx-pl@2x.png"
},
{
"title": "reddit",
"url": "https://www.reddit.com/",
"image_url": "reddit-com@2x.png"
},
{
"title": "twitter",
"url": "https://twitter.com/",
"image_url": "twitter-com@2x.png"
},
{
"title": "vk",
"url": "https://vk.com/",
"image_url": "vk-com@2x.png"
},
{
"title": "wikipedia",
"url": "https://www.wikipedia.org/",
"image_url": "wikipedia-com@2x.png"
},
{
"title": "wykop",
"url": "https://www.wykop.pl/",
"image_url": "wykop@2x.png"
},
{
"title": "youtube",
"url": "https://www.youtube.com/",
"image_url": "youtube-com@2x.png"
}
]
2 changes: 1 addition & 1 deletion yamscripts.yml
Expand Up @@ -49,7 +49,7 @@ scripts:

# buildmc: Export the bootstraped add-on to mozilla central
buildmc:
pre: =>cleanmc && =>tippymc
pre: =>cleanmc
webpack: webpack --config webpack.system-addon.config.js
css: node-sass system-addon/content-src/activity-stream.scss -o system-addon/data/content
locales: pontoon-to-json --src locales --dest system-addon/data
Expand Down

0 comments on commit c33cea4

Please sign in to comment.