aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-05-05 11:41:29 +0800
committerDan Finlay <dan@danfinlay.com>2016-05-05 11:41:34 +0800
commit93db6cacb5bd05fd5f8b786733f13231a2c3fb0c (patch)
tree904f9cb2138defeb8a08f98bc345fb79ec06d7eb
parentd929f8053202dabb866f5aea3fc0238593c474ce (diff)
downloadtangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar.gz
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar.bz2
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar.lz
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar.xz
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.tar.zst
tangerine-wallet-browser-93db6cacb5bd05fd5f8b786733f13231a2c3fb0c.zip
Fix button width transition bug
Fixes #160
-rw-r--r--ui/app/account-detail.js6
-rw-r--r--ui/app/app.js3
-rw-r--r--ui/app/css/transitions.css1
3 files changed, 8 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index a876b275f..9edb99e28 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -35,7 +35,11 @@ AccountDetailScreen.prototype.render = function() {
return (
- h('.account-detail-section.flex-column.flex-grow', [
+ h('.account-detail-section.flex-column.flex-grow', {
+ style: {
+ width: '330px',
+ },
+ }, [
// subtitle and nav
h('.section-title.flex-row.flex-center', [
diff --git a/ui/app/app.js b/ui/app/app.js
index 94c72a3c8..a4ce40881 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -65,7 +65,7 @@ App.prototype.render = function() {
h('.flex-column.flex-grow.full-height', {
style: {
// Windows was showing a vertical scroll bar:
- overflowY: 'hidden',
+ overflow: 'hidden',
}
},
[
@@ -82,6 +82,7 @@ App.prototype.render = function() {
h('.app-primary.flex-grow' + (transForward ? '.from-right' : '.from-left'), {
style: {
height: '380px',
+ width: '360px',
}
}, [
h(ReactCSSTransitionGroup, {
diff --git a/ui/app/css/transitions.css b/ui/app/css/transitions.css
index 3d0bf46a1..e2225a98d 100644
--- a/ui/app/css/transitions.css
+++ b/ui/app/css/transitions.css
@@ -19,6 +19,7 @@
position: absolute;
width: 100%;
transition: transform 300ms ease-in-out;
+ overflow-x: hidden;
}
/* final positions */