From 61e72c7feb565c295895c589faddfbc5ee8c0239 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 12 Dec 2014 01:05:59 -0300 Subject: [PATCH] add style on tx item --- css/src/main.css | 23 +++++++++++++++-- views/homeWallet.html | 2 +- views/includes/transaction.html | 45 +++++++++++++++------------------ 3 files changed, 43 insertions(+), 27 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 3557d1899..9523b610a 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -426,12 +426,19 @@ ul.tx-copayers { border-bottom: 1px solid #CAD2DA; } - .last-transactions-content { - padding: 0.8rem; + padding: 0.8rem 0.5rem; cursor:pointer; } +.last-transactions-content.active { + background-color: #F5F7F8; +} + +.last-transactions-content.active:hover { + background-color: #E4E8EC; +} + .sign-action { background: #E4E8EC; width: 100%; @@ -549,6 +556,7 @@ a.button-setup { .p70l {padding-left: 70px;} .p5h {padding: 0 5px;} .p20h {padding: 0 20px;} +.p25l {padding-left: 25px;} .p15 {padding:15px;} .p20 {padding:20px;} .p10 {padding:10px;} @@ -784,6 +792,17 @@ input[type=number]::-webkit-outer-spin-button { background-color: #1ABC9C; } +.tx-proposal i { + padding: .1rem .3rem; + background-color: #A5B2BF; + border-radius: 100%; + color: #fff; +} + +.tx-proposal i.active { + background-color: #A02F23; +} + .addresses .label { font-weight: normal; padding: .2rem .3rem; diff --git a/views/homeWallet.html b/views/homeWallet.html index b06f5f528..00e8f5314 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -58,7 +58,7 @@
-
+
Total Locked Balance: {{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 3a7f09cad..d8536f055 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,34 +1,31 @@ -
-
-
-
- - - - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} +
+
+
+ + + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + - -
-
-
- - - {{out.value}} - - {{$root.wallet.settings.unitName}} - - - {{out.alternativeAmount}} {{out.alternativeIsoCode}} - +
+
+ + {{out.value}} + + {{$root.wallet.settings.unitName}} +
+ + {{out.alternativeAmount}} {{out.alternativeIsoCode}} +