aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsdtsui <szehungdanieltsui@gmail.com>2017-08-03 14:07:35 +0800
committersdtsui <szehungdanieltsui@gmail.com>2017-08-03 14:07:35 +0800
commit01788376d5b7a0437b9073c8e8e0284a2cead6e4 (patch)
tree03f122493cae4dae27a4fe93423bd2437a74b4ae /ui
parentc47f81b2e0274d45eaef9bfc01118d7c19a3fa1b (diff)
downloadtangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar.gz
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar.bz2
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar.lz
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar.xz
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.tar.zst
tangerine-wallet-browser-01788376d5b7a0437b9073c8e8e0284a2cead6e4.zip
Finalize height for main screens, excluding sidebar
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/tx-view.js5
-rw-r--r--ui/app/components/wallet-view.js2
-rw-r--r--ui/app/css/index.css4
3 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index 2aaa32395..dc86e7ea8 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -43,12 +43,9 @@ function TxView () {
TxView.prototype.render = function () {
return h('div.tx-view.flex-column', {
style: {
- // width: '66.666%',
flexGrow: 2,
flexShrink: 0,
- flexBasis: '230px', // .666*345
- // flexBasis: '400px',
- height: '82vh',
+ flexBasis: '230px',
background: '#FFFFFF',
}
}, [
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 2a626a930..8fd555ccb 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -36,11 +36,9 @@ WalletView.prototype.render = function () {
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
style: {
- // width: '33.333%',
flexGrow: 1,
flexShrink: 0,
flexBasis: '230px', // .333*345
- height: '82vh',
background: '#FAFAFA', // TODO: add to reusable colors
...style,
}
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 779d0646d..750586328 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -744,6 +744,7 @@ div.message-container > div:first-child {
.main-container {
margin-top: 35px;
width: 85%;
+ height: 90vh;
}
}
@@ -751,6 +752,7 @@ div.message-container > div:first-child {
.main-container {
margin-top: 35px;
width: 80%;
+ height: 82vh;
}
}
@@ -758,6 +760,7 @@ div.message-container > div:first-child {
.main-container {
margin-top: 35px;
width: 65%;
+ height: 82vh;
}
}
@@ -774,5 +777,6 @@ div.message-container > div:first-child {
margin-top: 35px;
// position: relative;
width: 100%;
+ height: 100%
}
} \ No newline at end of file