aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/first-time/disclaimer.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-06-29 04:14:38 +0800
committerkumavis <aaron@kumavis.me>2016-06-29 04:14:38 +0800
commit19f9d6566bb9a8f28a33de8e235fbb28b0c2c021 (patch)
tree49362cd9c10c8170bc11e3e1f6c2eff819ca63df /ui/app/first-time/disclaimer.js
parent1cd17af2ad494e36ee37740648ccd8c47994ec82 (diff)
parent913533522f650e340a369103f2d8018a92ad9bc1 (diff)
downloadtangerine-wallet-browser-19f9d6566bb9a8f28a33de8e235fbb28b0c2c021.tar.gz
tangerine-wallet-browser-19f9d6566bb9a8f28a33de8e235fbb28b0c2c021.tar.zst
tangerine-wallet-browser-19f9d6566bb9a8f28a33de8e235fbb28b0c2c021.zip
Merge branch 'master' into pr/351
# Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
Diffstat (limited to 'ui/app/first-time/disclaimer.js')
-rw-r--r--ui/app/first-time/disclaimer.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index bfd6c490d..7f615cfb0 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -38,7 +38,7 @@ DisclaimerScreen.prototype.render = function () {
style: {
whiteSpace: 'pre-line',
background: 'rgb(235, 235, 235)',
- height: '336px',
+ height: '310px',
padding: '6px',
width: '80%',
overflowY: 'scroll',