From 78db09e9b95814cb00531a4c3f40416af118e1ed Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Dec 2014 10:48:12 -0300 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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}} + + × +
+ +
+
+ +
+
+