aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-08-04 04:10:46 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-08-04 04:10:46 +0800
commit81982d01c05b37b80bfb08f1f65a742555acbe0f (patch)
tree0220c6d61fd1c0b9a448ee226eecf98c717fac05 /app
parent15bcbb4941efc66630e9abf1ff27370e759f753d (diff)
parent4115c25d8f2e186a575de7904a91b3717da5e800 (diff)
downloadtangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar.gz
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar.bz2
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar.lz
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar.xz
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.tar.zst
tangerine-wallet-browser-81982d01c05b37b80bfb08f1f65a742555acbe0f.zip
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI
Diffstat (limited to 'app')
-rw-r--r--app/home.html12
-rw-r--r--app/popup.html5
2 files changed, 15 insertions, 2 deletions
diff --git a/app/home.html b/app/home.html
new file mode 100644
index 000000000..cfb4b00a0
--- /dev/null
+++ b/app/home.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
+ <title>MetaMask Plugin</title>
+ </head>
+ <body>
+ <div id="app-content"></div>
+ <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script>
+ </body>
+</html>
diff --git a/app/popup.html b/app/popup.html
index 6d85a9811..d09b09315 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -2,10 +2,11 @@
<html>
<head>
<meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
<title>MetaMask Plugin</title>
</head>
- <body>
+ <body style="width:357px; height:500px;">
<div id="app-content"></div>
<script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script>
</body>
-</html> \ No newline at end of file
+</html>