From 8b6e69927e7b1ebdca12962b03d4a85f42e5ec7a Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 11 Dec 2014 23:44:56 -0300 Subject: [PATCH 1/8] fix change bg colour --- css/src/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/src/main.css b/css/src/main.css index 7e5845571..3557d1899 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 { From 61e72c7feb565c295895c589faddfbc5ee8c0239 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 12 Dec 2014 01:05:59 -0300 Subject: [PATCH 2/8] 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}} +
From 041b2c615fe2a3da3ecc749922b0fe302ec9028b Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 12 Dec 2014 02:21:32 -0300 Subject: [PATCH 3/8] add style on popup --- css/src/main.css | 28 ++++-- css/src/mobile.css | 13 +++ views/modals/txp-details.html | 178 ++++++++++++++++++---------------- 3 files changed, 124 insertions(+), 95 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 9523b610a..c166f6563 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -803,6 +803,13 @@ input[type=number]::-webkit-outer-spin-button { background-color: #A02F23; } +.txp-popup .header { + background: #F3F5F6; + width: 100%; + padding: 0.8rem; + position: relative; +} + .addresses .label { font-weight: normal; padding: .2rem .3rem; @@ -1608,14 +1615,17 @@ 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: 37px; + right: 15px; + line-height: 0; + color: #7A8C9E; + border-radius: 3px; } +.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover { + background-color: #7A8C9E; + color: #fff; +} diff --git a/css/src/mobile.css b/css/src/mobile.css index a3c3a5f1c..81134430a 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%; @@ -290,5 +294,14 @@ padding: 15px; } + .button-popup { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + background-color: #F3F5F6; + padding: 1rem 0; + } + } diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html index f7be43a79..1bc60289e 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,94 +1,100 @@ - -
- 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}} + +
+ +
+ +
+
+

Bechilandia@gmail.com

+
+ +
+
+
+ {{tx.comment}}
-
-
- To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} +
+
+

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)}} +
    • +
+
+
+ +
+
+ +
+ + {{error}} - - + × +
+ +
+
+ +
+
+ +
-
- - -
- -
- Note: {{tx.comment}} -
- - -
- Merchant Message: {{tx.merchant.pr.pd.memo}} -
-
- Expires: {{tx.merchant.expirationDate | amTimeAgo }} -
- -
- Signatures: -
    -
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
-
-
- -
-
- -
- - {{error}} - - × -
- -
-
- -
-
- -
-
- - From 84eca0458958b542d4731506d37597934f4283b2 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 12 Dec 2014 12:04:32 -0300 Subject: [PATCH 4/8] fix close button on all popups --- css/src/main.css | 4 ++-- views/modals/address-book.html | 4 +--- views/modals/paypro.html | 8 +------- views/modals/qr-address.html | 4 +--- views/modals/tx-details.html | 7 +------ views/modals/wallet-info.html | 7 +------ views/modals/walletSelection.html | 8 +------- 7 files changed, 8 insertions(+), 34 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index c166f6563..cb24573a4 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1618,8 +1618,8 @@ input.ng-invalid-match, input.ng-invalid-match:focus { padding: 0.8rem; position: absolute; background: #E4E8EC; - top: 37px; - right: 15px; + top: 10px; + right: 10px; line-height: 0; color: #7A8C9E; border-radius: 3px; 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/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 @@
- +
From 78db09e9b95814cb00531a4c3f40416af118e1ed Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Dec 2014 10:48:12 -0300 Subject: [PATCH 5/8] hovers only for desktop --- css/src/desktop.css | 9 +++++++++ css/src/main.css | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) 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 cb24573a4..7507e291f 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -435,10 +435,6 @@ ul.tx-copayers { background-color: #F5F7F8; } -.last-transactions-content.active:hover { - background-color: #E4E8EC; -} - .sign-action { background: #E4E8EC; width: 100%; @@ -1625,7 +1621,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus { border-radius: 3px; } -.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover { - background-color: #7A8C9E; - color: #fff; -} From 44d97ed163f80f46efa608a50b740f660b5d3c17 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Dec 2014 12:07:46 -0300 Subject: [PATCH 6/8] fix repeat tx-outs. fix iden name --- views/includes/transaction.html | 1 - views/modals/txp-details.html | 39 +++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/views/includes/transaction.html b/views/includes/transaction.html index d8536f055..672a85b3d 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -12,7 +12,6 @@ -
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html index 1bc60289e..910060ef7 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,32 +1,33 @@
-
- - - 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}} -
-

Bechilandia@gmail.com

+

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

From 5263f3499158a49e97be48b367351cb6a24bfaa5 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Dec 2014 12:14:25 -0300 Subject: [PATCH 7/8] fix modal for payment intent --- js/controllers/walletForPayment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, }); From df03fc9112691bd0b4637aab62f633f5ef82a276 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Dec 2014 12:39:22 -0300 Subject: [PATCH 8/8] fix txps modal --- css/src/main.css | 2 +- css/src/mobile.css | 9 -- views/modals/txp-details.html | 179 +++++++++++++++++----------------- 3 files changed, 89 insertions(+), 101 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 7507e291f..f968155da 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -799,7 +799,7 @@ input[type=number]::-webkit-outer-spin-button { background-color: #A02F23; } -.txp-popup .header { +.header-modal { background: #F3F5F6; width: 100%; padding: 0.8rem; diff --git a/css/src/mobile.css b/css/src/mobile.css index 81134430a..94e709756 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -294,14 +294,5 @@ padding: 15px; } - .button-popup { - position: fixed; - bottom: 0; - left: 0; - width: 100%; - background-color: #F3F5F6; - padding: 1rem 0; - } - } diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html index 910060ef7..9f988fca0 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,101 +1,98 @@ -
-
-
-
- - - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - +
+
+
+ + + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + +
+ +
+
+ {{out.value}} {{$root.wallet.settings.unitName}}
- -
-
- {{out.value}} {{$root.wallet.settings.unitName}} -
- - {{out.alternativeAmount}} {{out.alternativeIsoCode}} - -
-
- -
- -
-
-

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

-
- -
-
-
- {{tx.comment}} + + {{out.alternativeAmount}} {{out.alternativeIsoCode}} +
+ +
-
-
-

Merchant Message:

-
- Expires: {{tx.merchant.expirationDate | amTimeAgo }} -
-
-
- {{tx.merchant.pr.pd.memo}} +
+
+

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

+
+
- -
- Signatures: -
    -
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
-
-
- -
-
- -
- - {{error}} - - × -
- -
-
- -
-
- -
+
+ {{tx.comment}} +
+
+ +
+
+

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)}} +
    • +
+
+ +
+
+ +
+ + {{error}} + + × +
+ +
+
+ +
+
+