aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-02-16 23:46:51 +0800
committerGitHub <noreply@github.com>2018-02-16 23:46:51 +0800
commit79f62635d787126f99a31508be8a927d23db639d (patch)
tree201d1d977ee80ec9164690ff13aaa94e110bfd98
parent170c7602b70e475e75fbd1c7181d03e22465ae24 (diff)
parented33f3160a35e2e765012a4726ff90f9b3608998 (diff)
downloadtangerine-wallet-browser-79f62635d787126f99a31508be8a927d23db639d.tar.gz
tangerine-wallet-browser-79f62635d787126f99a31508be8a927d23db639d.tar.zst
tangerine-wallet-browser-79f62635d787126f99a31508be8a927d23db639d.zip
Merge pull request #3261 from MetaMask/uat-oldui-compatibility
Adjust old UI css compatibility with new UI style changes
-rw-r--r--app/popup.html4
-rw-r--r--old-ui/app/components/account-dropdowns.js1
-rw-r--r--old-ui/app/config.js2
-rw-r--r--old-ui/app/css/index.css4
4 files changed, 6 insertions, 5 deletions
diff --git a/app/popup.html b/app/popup.html
index c4e5188e5..bf09b97ca 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -1,11 +1,11 @@
<!doctype html>
-<html style="width:350px; height:600px;">
+<html style="width:357px; height:600px;">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
<title>MetaMask Plugin</title>
</head>
- <body style="width:350px; height:600px;">
+ <body style="width:357px; height:600px;">
<div id="app-content"></div>
<script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script>
</body>
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js
index a3908f45d..7cc581f84 100644
--- a/old-ui/app/components/account-dropdowns.js
+++ b/old-ui/app/components/account-dropdowns.js
@@ -268,6 +268,7 @@ class AccountDropdowns extends Component {
'i.fa.fa-ellipsis-h',
{
style: {
+ margin: '0.5em',
fontSize: '1.8em',
},
onClick: (event) => {
diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index 689385a02..9e07cf348 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -32,7 +32,7 @@ ConfigScreen.prototype.render = function () {
return (
h('.flex-column.flex-grow', {
style:{
- maxHeight: '465px',
+ maxHeight: '585px',
overflowY: 'auto',
},
}, [
diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css
index cdb4cc439..67c327f62 100644
--- a/old-ui/app/css/index.css
+++ b/old-ui/app/css/index.css
@@ -285,7 +285,7 @@ app sections
}
.unlock-screen #metamask-mascot-container {
- margin-top: 24px;
+ margin-top: 80px;
}
.unlock-screen h1 {
@@ -443,7 +443,7 @@ input.large-input {
flex-wrap: wrap;
overflow-x: hidden;
overflow-y: auto;
- max-height: 465px;
+ max-height: 585px;
flex-direction: inherit;
}