diff --git a/css/src/desktop.css b/css/src/desktop.css index 8b1b34249..be2e39728 100644 --- a/css/src/desktop.css +++ b/css/src/desktop.css @@ -172,3 +172,12 @@ a.text-warning:hover {color: #FD7262;} background: #ddd; } +.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover { + background-color: #7A8C9E; + color: #fff; +} + +.last-transactions-content.active:hover { + background-color: #E4E8EC; +} + diff --git a/css/src/main.css b/css/src/main.css index 7e5845571..f968155da 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -339,7 +339,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .main { margin-left: 250px; padding: 95px 1.5rem; - background-color: #F8F8FB; + background-color: #E8ECEF; } .logo-setup { @@ -426,12 +426,15 @@ 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; +} + .sign-action { background: #E4E8EC; width: 100%; @@ -549,6 +552,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 +788,24 @@ 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; +} + +.header-modal { + background: #F3F5F6; + width: 100%; + padding: 0.8rem; + position: relative; +} + .addresses .label { font-weight: normal; padding: .2rem .3rem; @@ -1589,14 +1611,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .reveal-modal .close-reveal-modal, dialog .close-reveal-modal { - padding: 5px 10px; - position: relative; - font-weight: normal; - border: 1px solid #bbb; - font-size: 22px; - background:#eee; - right:0; - top:0; - text-transform: uppercase; + padding: 0.8rem; + position: absolute; + background: #E4E8EC; + top: 10px; + right: 10px; + line-height: 0; + color: #7A8C9E; + border-radius: 3px; } diff --git a/css/src/mobile.css b/css/src/mobile.css index a3c3a5f1c..94e709756 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -52,6 +52,10 @@ padding: 1rem 0; } + .reveal-modal { + padding: 0.5rem; + } + header { height: 45px; line-height: 110%; diff --git a/js/controllers/walletForPayment.js b/js/controllers/walletForPayment.js index bbb40cc22..5bdaa50a6 100644 --- a/js/controllers/walletForPayment.js +++ b/js/controllers/walletForPayment.js @@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('walletForPaymentController', var modalInstance = $modal.open({ templateUrl: 'views/modals/walletSelection.html', - windowClass: 'tiny', + windowClass: 'small', controller: ModalInstanceCtrl, }); 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..672a85b3d 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,34 +1,30 @@ -
-
-
-
- - ● - - 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}} +
diff --git a/views/modals/address-book.html b/views/modals/address-book.html index 9bc984882..1d36b206d 100644 --- a/views/modals/address-book.html +++ b/views/modals/address-book.html @@ -1,6 +1,3 @@ -
- Close -

Address Book

@@ -89,4 +86,5 @@
Add entry
+
diff --git a/views/modals/paypro.html b/views/modals/paypro.html index 9cb597acc..a9f16c0e1 100644 --- a/views/modals/paypro.html +++ b/views/modals/paypro.html @@ -1,10 +1,3 @@ - -
- Close -
- - -
{{md.unitTotal}} {{$root.wallet.settings.unitName}} @@ -12,6 +5,7 @@
{{ alternative }} {{ alternativeIsoCode }}
+
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html index 777a3fcb8..78444bfa0 100644 --- a/views/modals/qr-address.html +++ b/views/modals/qr-address.html @@ -1,6 +1,3 @@ -
- Close -
@@ -12,4 +9,5 @@ ({{label}})
+
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 50205df89..baabd0e5c 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -1,9 +1,3 @@ - -
- Close -
- -
{{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}
+
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html index f7be43a79..9f988fca0 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,64 +1,69 @@ - -
- Close -
- -
-
-
- {{out.value}} {{$root.wallet.settings.unitName}} +
+
+
+ + + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + +
-
- {{out.alternativeAmount}} {{out.alternativeIsoCode}} + +
+
+ {{out.value}} {{$root.wallet.settings.unitName}} +
+ + {{out.alternativeAmount}} {{out.alternativeIsoCode}} +
-
+ +
-
- To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - - +
+
+

{{$root.iden.getName()}}

+
+ +
+
+
+ {{tx.comment}}
-
- - -
- -
- Note: {{tx.comment}} -
- - -
- Merchant Message: {{tx.merchant.pr.pd.memo}} -
-
- Expires: {{tx.merchant.expirationDate | amTimeAgo }} +
+
+

Merchant Message:

+
+ Expires: {{tx.merchant.expirationDate | amTimeAgo }} +
+
+
+ {{tx.merchant.pr.pd.memo}} +
Signatures:
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} + + + + + + + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
-
@@ -70,11 +75,11 @@ ×
-
-
-
- diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html index dc6f60bf4..58b5a7ca4 100644 --- a/views/modals/wallet-info.html +++ b/views/modals/wallet-info.html @@ -1,8 +1,3 @@ - -
- Close -
-

{{item.name || item.id }}

@@ -58,5 +53,5 @@ Copy this text as it is in a safe place (notepad or email)

- +
diff --git a/views/modals/walletSelection.html b/views/modals/walletSelection.html index 5d7617984..cfc8c2321 100644 --- a/views/modals/walletSelection.html +++ b/views/modals/walletSelection.html @@ -1,9 +1,3 @@ - -
- Close -
- -

Select a wallet to make the payment

@@ -29,5 +23,5 @@
- +