aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/app/components/tx-view.js5
-rw-r--r--ui/app/components/wallet-view.js6
-rw-r--r--ui/app/css/itcss/components/newui-sections.scss16
3 files changed, 17 insertions, 10 deletions
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index 6b8e9e4dd..97b9a89f4 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -43,10 +43,7 @@ TxView.prototype.render = function () {
const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684' // TODO: remove fake address
return h('div.tx-view.flex-column', {
- style: {
- flex: '62 0 62%',
- background: '#FFFFFF',
- }
+ style: {},
}, [
h('div.flex-row.phone-visible', {
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index cb1448598..1c7330193 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -35,11 +35,7 @@ WalletView.prototype.render = function () {
const { network, responsiveDisplayClassname, style } = this.props
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
- style: {
- flex: '28 0 28%',
- background: '#FAFAFA', // TODO: add to reusable colors
- ...style,
- }
+ style: {},
}, [
// TODO: Separate component: wallet account details
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index 761e74561..02acfca47 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -13,7 +13,21 @@
overflow-y: scroll;
}
-.sidebar {
+
+// tx view
+.tx-view {
+ flex: 63.5 0 66.5%;
+ background: '#FFFFFF'; // TODO: add to resuable colors
+}
+
+.wallet-view {
+ flex: 33.5 0 33.5%;
+ background: #FAFAFA, // TODO: add to reusable colors
+}
+
+// wallet view
+
+.wallet-view.sidebar {
flex: 1 0 230px;
background: rgb(250, 250, 250);
z-index: 26;