Skip to content

Commit

Permalink
Merge pull request marcelduran#112 from joecarney/master
Browse files Browse the repository at this point in the history
New icon that looks a bit better on a Retina Mac running Chrome...
Thanks @joecarney
  • Loading branch information
marcelduran committed Mar 15, 2014
2 parents c12ff03 + fe10569 commit 1f9bcab
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
8 changes: 7 additions & 1 deletion src/chrome/background.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
!tab.url.indexOf('chrome-extension://')) {
alert('For security reasons Chrome extensions cannot ' +
'run content scripts at this page.');

return;
}
chrome.windows.create({
Expand All @@ -23,6 +23,12 @@
type: 'popup'
});
});
chrome.browserAction.setIcon({
path: {
"19": "icon19x19.png",
"38": "[email protected]"
}
});
</script>
</body>
</html>
Expand Down
Binary file modified src/chrome/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/chrome/icon19x19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/chrome/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/chrome/icon_color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 15 additions & 14 deletions src/chrome/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,27 @@
},
"browser_action": {
"name": "YSlow",
"default_icon": "icon.png"
"default_icon": {
"19": "icon38x19.png",
"38": "[email protected]"
},
},
"background_page": "background.html",
"options_page": "options.html",
"content_scripts": [
{
"matches": [
"http://*/*",
"https://*/*"
],
"js": [
"content.js",
"yslow-chrome.js"
]
}
],
"content_scripts": [{
"matches": [
"http://*/*",
"https://*/*"
],
"js": [
"content.js",
"yslow-chrome.js"
]
}],
"permissions": [
"tabs",
"cookies",
"http://*/*",
"https://*/*"
]
}
}

0 comments on commit 1f9bcab

Please sign in to comment.