aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2018-01-17 03:05:40 +0800
committerDan Finlay <dan@danfinlay.com>2018-01-17 03:05:40 +0800
commitc0cf665b8581df4fe1ea360f28c0d2ed940c21c8 (patch)
tree27edbac0dd434666b7081de4e08c7b7b5b0defd2 /ui
parent8fb62b97c5b0901c7e4402d49538db87396c8579 (diff)
parentb046f96d4b0809422ac8e1dbfcbdd7a545e7ff3f (diff)
downloadtangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar.gz
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar.bz2
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar.lz
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar.xz
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.tar.zst
tangerine-wallet-browser-c0cf665b8581df4fe1ea360f28c0d2ed940c21c8.zip
Merge branch 'master' into i2907-NoCodeGasLimit
Diffstat (limited to 'ui')
-rw-r--r--ui/app/account-detail.js1
-rw-r--r--ui/app/css/index.css2
2 files changed, 3 insertions, 0 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index d4f707e0b..c9a8a774d 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -161,6 +161,7 @@ AccountDetailScreen.prototype.render = function () {
textOverflow: 'ellipsis',
paddingTop: '3px',
width: '5em',
+ height: '15px',
fontSize: '13px',
fontFamily: 'Montserrat Light',
textRendering: 'geometricPrecision',
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index c0bf18c23..b40d48b5d 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -441,7 +441,9 @@ input.large-input {
.account-detail-section {
display: flex;
flex-wrap: wrap;
+ overflow-x: hidden;
overflow-y: auto;
+ max-height: 465px;
flex-direction: inherit;
}