aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-10-05 22:22:51 +0800
committerkumavis <aaron@kumavis.me>2016-10-05 22:22:51 +0800
commitea4946ab3affde3dc85fda17448209cb934cc667 (patch)
tree9aad77092f453a82ecf71c92a4d72cc7ef597588 /app
parent6ee22e66884d993413dd4fb6e0f76ed2e5386810 (diff)
parente5bf957242b1d443ef15b588340dba1a5e34b92a (diff)
downloadtangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.gz
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.bz2
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.lz
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.xz
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.zst
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.zip
Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3
Diffstat (limited to 'app')
-rw-r--r--app/images/icon-32.pngbin0 -> 1730 bytes
-rw-r--r--app/images/icon-64.pngbin0 -> 3573 bytes
-rw-r--r--app/manifest.json5
-rw-r--r--app/scripts/lib/notifications.js2
4 files changed, 4 insertions, 3 deletions
diff --git a/app/images/icon-32.png b/app/images/icon-32.png
new file mode 100644
index 000000000..f801ebb6b
--- /dev/null
+++ b/app/images/icon-32.png
Binary files differ
diff --git a/app/images/icon-64.png b/app/images/icon-64.png
new file mode 100644
index 000000000..b3019ad65
--- /dev/null
+++ b/app/images/icon-64.png
Binary files differ
diff --git a/app/manifest.json b/app/manifest.json
index f5d08709a..badeb7cb2 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -10,7 +10,7 @@
"suggested_key": {
"windows": "Alt+Shift+M",
"mac": "Alt+Shift+M",
- "chromeos": "Search+M",
+ "chromeos": "Alt+Shift+M",
"linux": "Alt+Shift+M"
}
}
@@ -55,9 +55,10 @@
}
],
"permissions": [
- "notifications",
"storage",
"tabs",
+ "clipboardWrite",
+ "clipboardRead",
"http://localhost:8545/"
],
"web_accessible_resources": [
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 422f46f6d..cd7535232 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -1,5 +1,5 @@
const extension = require('./extension')
-const height = 500
+const height = 520
const width = 360
const notifications = {