From 6baf35dad09d8d2763a99ec118cdc38d2f39d06c Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 2 Dec 2014 15:32:42 -0300 Subject: [PATCH 01/10] style 01 proposal --- css/src/main.css | 93 +++++++++++--------- css/src/mobile.css | 4 - views/includes/transaction.html | 146 +++++++++++++++++--------------- views/send.html | 2 +- 4 files changed, 131 insertions(+), 114 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 1720f41f0..5230e0345 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -404,14 +404,48 @@ a:hover { background-color: #C0392A; } +.panel.last-transactions { + padding: 0; + margin-bottom: 2.25rem; +} -.last-transactions { - margin-bottom: 2rem; - background-color: #E8EAEF; +a.missing-copayers { + background: #7A8C9E; + position: absolute; + display: block; + right: -1px; + bottom: -23px; + padding: 0.2rem 0.5rem; + font-size: 10px; + border-radius: 0 0 3px 3px; + text-transform: uppercase; + color: #fff; + font-weight: 700; +} + +ul.tx-copayers { + background: #E4E8EC; + padding: 0.8rem; + margin-left: 0; +} + +.tx-copayers li { + border-bottom: 1px solid #CAD2DA; + list-style: none; + padding: 0.3rem; + font-size: 12px; } .last-transactions-header { - padding: 0.5rem; + border-radius: 3px 3px 0 0; + background: #2C3E50; + padding: 0.6rem; + color: #fff; +} + +.last-transactions-content { + padding: 0.8rem 0.8rem 0; + color: #7A8C9E; } .last-transactions-footer { @@ -419,11 +453,6 @@ a:hover { overflow: hidden; } -table.last-transactions-content { - background-color: #F8F8FB; - margin-bottom: 10px; -} - .last-transactions-content .box-status { font-size: 13px; width: 30px; @@ -446,7 +475,7 @@ table.last-transactions-content { color: #fff; } -.last-transactions-content .icon-active-check { +.tx-copayers .icon-active-check { background-color: #3FBC9C; color: #fff; } @@ -456,26 +485,12 @@ table.last-transactions-content { color: #fff; } -.private-message { - margin-bottom: 10px; - padding-bottom: 10px; - border-bottom: 1px solid #fff; -} - -.header-message { - background-color: #F8F8FB; - height: 18px; -} - .date-message { - background-color: #3C4E60; - color: #fff; + background-color: #213140; + border-radius: 3px; font-size: 12px; - padding: 2px 5px; - -webkit-border-radius: 0 5px 0 0; - -moz-border-radius: 0 5px 0 0; - -ms-border-radius: 0 5px 0 0; - border-radius: 0 5px 0 0; + padding: 0.2rem 0.4rem; + color: #7A8C9E; } .input-note { @@ -485,18 +500,14 @@ table.last-transactions-content { } .send-note { - background-color: #EDEDF5; + background-color: #F8F8FB; padding: 10px; - margin-bottom: 10px; } -.send-note p { +.send-note span { margin-bottom: 5px; font-size: 12px; -} - -.send-note b { - color: #000; + color: #2C3E50; } a.button-setup.add-wallet { @@ -610,12 +621,12 @@ a.button-setup { } .line-t { - border-top: 1px solid #F8F8FB; + border-top: 1px solid #E9E9EC; padding-top: 0.5rem; } .line-b { - border-bottom: 1px solid #F8F8FB; + border-bottom: 1px solid #E9E9EC; padding-bottom: 0.5rem; } @@ -1383,6 +1394,8 @@ a:hover .photo-container { margin-bottom: 0.2rem; } +icon-status.icon-active-check + .has-error { color: #C0392A; } @@ -1456,9 +1469,9 @@ a.text-warning:hover {color: #FD7262;} .panel { border-radius: 3px; background: #FFFFFF; - -moz-box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.10); - box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.10); - -o-box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.10); + -moz-box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.20); + box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.20); + -o-box-shadow: 1.5px 1.5px 0px 0px rgba(32,48,64,0.20); border: none; } diff --git a/css/src/mobile.css b/css/src/mobile.css index 6ad00ac5c..588133526 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -221,10 +221,6 @@ padding: 0.15rem 0.2rem; } - .line-t { - border-top: 1px solid #3C5269; - } - } @media (max-width: 640px) { diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 190af0997..342ff20a7 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,61 +1,41 @@ -
- {{tx.createdTs | amCalendar}} -
-
-
- - {{tx.comment}} + +
+
+
+ + {{tx.comment}} +
+
+ {{tx.createdTs | amCalendar}} +
+
+ +
-
-
- {{out.value}} {{$root.wallet.settings.unitName}} - - {{out.alternativeAmount}} {{out.alternativeIsoCode}} - -
+
+ {{out.value}} {{$root.wallet.settings.unitName}} + + {{out.alternativeAmount}} {{out.alternativeIsoCode}} +
-
+
- -
+
-

- {{tx.merchant.pr.pd.memo}} -

- Expires {{tx.merchant.pr.pd.expires * 1000 | amTimeAgo }} + {{tx.merchant.pr.pd.memo}}
+ Expires {{tx.merchant.pr.pd.expires * 1000 | amTimeAgo }} [{{tx.merchant.domain}}] - {{tx.merchant.pr.ca}} + {{tx.merchant.pr.ca}} Untrusted

+
- - - - - - - - - -
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} - - - - - - - - - - -
-
@@ -84,31 +64,59 @@
-
-
- Transaction finally rejected -
-
-
- Sent -
-
- Transaction ID: - - {{tx.sentTxid}} - -
-
-
- One signature missing -
-
- {{tx.missingSignatures}} signatures missing -
-
- Fee: {{tx.fee}} {{$root.wallet.settings.unitName}} - Proposal ID: {{tx.ntxid}} -
+
+ Fee: {{tx.fee}} {{$root.wallet.settings.unitName}} + Proposal ID: {{tx.ntxid}}
+ + +
+ + One signature missing +
+
+ + {{tx.missingSignatures}} signatures missing +
+ + +
    +
  • + + + + + + + + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    • +
+ \ No newline at end of file diff --git a/views/send.html b/views/send.html index 8b4b60617..7cedcf8bb 100644 --- a/views/send.html +++ b/views/send.html @@ -2,7 +2,7 @@

Pending Transactions Proposals

-
From 871099c9c1cb2782130d88c73cb694d3fe3e144e Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 2 Dec 2014 15:35:24 -0300 Subject: [PATCH 02/10] fix bug --- css/src/main.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 5230e0345..899e7c468 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1394,8 +1394,6 @@ a:hover .photo-container { margin-bottom: 0.2rem; } -icon-status.icon-active-check - .has-error { color: #C0392A; } From 29f4e9142383e5f347f1b77316cb721161b01120 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 2 Dec 2014 17:06:22 -0300 Subject: [PATCH 03/10] Fix amount input (angular directive) --- js/directives.js | 5 ++--- views/send.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/js/directives.js b/js/directives.js index 262cb719e..ac823cdb1 100644 --- a/js/directives.js +++ b/js/directives.js @@ -91,15 +91,14 @@ angular.module('copayApp.directives') ]) .directive('validAmount', ['$rootScope', '$locale', function($rootScope, locale) { - var w = $rootScope.wallet; - preconditions.checkState(w); - preconditions.checkState(w.settings.unitToSatoshi); var formats = locale.NUMBER_FORMATS; return { require: 'ngModel', link: function(scope, element, attrs, ctrl) { var val = function(value) { + var w = $rootScope.wallet; + preconditions.checkState(w); var vNum = Number((value * w.settings.unitToSatoshi).toFixed(0)); if (typeof value == 'undefined') { diff --git a/views/send.html b/views/send.html index 7cedcf8bb..5804b0027 100644 --- a/views/send.html +++ b/views/send.html @@ -88,7 +88,7 @@
From 824df05a91e7d119d66eb46886a521a56ece6ba9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 2 Dec 2014 17:51:12 -0300 Subject: [PATCH 04/10] fix tx proposal list --- views/includes/transaction.html | 67 ++++++++++++++------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 342ff20a7..eaa7fc906 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -38,7 +38,17 @@
-
+
+
+ +
+
+ +
-
-
- Fee: {{tx.fee}} {{$root.wallet.settings.unitName}} - Proposal ID: {{tx.ntxid}} +
+
+ Fee: {{tx.fee}} {{$root.wallet.settings.unitName}} +
+
+ Proposal ID: {{tx.ntxid}} +
- - -
- + + + {{tx.missingSignatures}} signatures missing -
+ + -
    +
    • @@ -91,32 +106,8 @@ - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
    - \ No newline at end of file + From dbb3db0ffff33c01fb306a23b62c67e3b5f8dd64 Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 2 Dec 2014 21:51:45 -0300 Subject: [PATCH 05/10] add style on tx 01 --- css/src/main.css | 36 +++++++++++++++++---------------- css/src/mobile.css | 15 +++++++++----- views/includes/transaction.html | 25 +++++++++++++---------- 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 899e7c468..1ee1c3a4d 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -407,6 +407,7 @@ a:hover { .panel.last-transactions { padding: 0; margin-bottom: 2.25rem; + border-radius: 3px 3px 0 3px; } a.missing-copayers { @@ -414,7 +415,7 @@ a.missing-copayers { position: absolute; display: block; right: -1px; - bottom: -23px; + bottom: -18px; padding: 0.2rem 0.5rem; font-size: 10px; border-radius: 0 0 3px 3px; @@ -427,6 +428,8 @@ ul.tx-copayers { background: #E4E8EC; padding: 0.8rem; margin-left: 0; + box-shadow: inset 0 1px 1px 0 rgba(10,19,28,.12); + border-radius: 0 0 3px 3px; } .tx-copayers li { @@ -441,6 +444,9 @@ ul.tx-copayers { background: #2C3E50; padding: 0.6rem; color: #fff; + box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); + -moz-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); + -o-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); } .last-transactions-content { @@ -449,7 +455,7 @@ ul.tx-copayers { } .last-transactions-footer { - padding: 0.5rem; + padding: 0.8rem; overflow: hidden; } @@ -475,14 +481,19 @@ ul.tx-copayers { color: #fff; } -.tx-copayers .icon-active-check { - background-color: #3FBC9C; +.icon-sign { + padding: 0.2rem 0.3rem; + border-radius: 100%; color: #fff; + margin-right: 7px; } -.last-transactions-content .icon-active-x { +.icon-sign.check { + background-color: #3FBC9C; +} + +.icon-sign.x { background-color: #C0392B; - color: #fff; } .date-message { @@ -1009,8 +1020,8 @@ button[disabled].secondary:focus, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus { - background-color: #95a5a6; - color: #E6E6E6; + background-color: #E4E8EC; + color: #A5B2BF; } /* PRIMARY */ @@ -1385,15 +1396,6 @@ a:hover .photo-container { float: right; } -.icon-status { - background-color: #34495E; - color: #7A8C9E; - border-radius: 100%; - padding: 0.17rem 0.3rem; - float: left; - margin-bottom: 0.2rem; -} - .has-error { color: #C0392A; } diff --git a/css/src/mobile.css b/css/src/mobile.css index 588133526..def7b760d 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -173,6 +173,10 @@ padding: 0.5rem; } + .panel.last-transactions { + margin-bottom: 3.25rem; + } + .addresses .list-addr contact { margin-left: 0; font-size: 14px; @@ -182,11 +186,12 @@ width: auto; padding: 0 5px; } - - table.last-transactions-content .icon-status { - border-radius: 0; - padding: 0.1rem 0.3rem; - margin-bottom: 0; + + a.missing-copayers { + bottom: -34px; + text-align: center; + padding: .7rem; + width: 100%; } .button, button { diff --git a/views/includes/transaction.html b/views/includes/transaction.html index eaa7fc906..95447f1a5 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -38,32 +38,32 @@
    -
    +
    -
    -
    @@ -74,7 +74,7 @@
    -
    +
    Fee: {{tx.fee}} {{$root.wallet.settings.unitName}}
    @@ -94,14 +94,17 @@ {{tx.missingSignatures}} signatures missing - + + Copayers + +
    • - - + + From 3861e4e3886aceead858bb399c51025aca69a687 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 11:55:52 -0300 Subject: [PATCH 06/10] Fix copayer list from "Send" and "History" --- css/src/main.css | 5 ++++- views/history.html | 17 ++++++----------- views/includes/transaction.html | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 1ee1c3a4d..edc428dd7 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -433,12 +433,15 @@ ul.tx-copayers { } .tx-copayers li { - border-bottom: 1px solid #CAD2DA; list-style: none; padding: 0.3rem; font-size: 12px; } +.tx-copayers li.bottom-line-copayers { + border-bottom: 1px solid #CAD2DA; +} + .last-transactions-header { border-radius: 3px 3px 0 0; background: #2C3E50; diff --git a/views/history.html b/views/history.html index eaa23f302..074636da7 100644 --- a/views/history.html +++ b/views/history.html @@ -96,21 +96,16 @@
    - - + - - + diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 95447f1a5..78893e0af 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -101,7 +101,7 @@
      -
    • +
    • From 3d2548e4f7b65c4949af87012416b915e8e25ec2 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 3 Dec 2014 12:10:25 -0300 Subject: [PATCH 07/10] fix padding copayers --- 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 edc428dd7..ae1973e6c 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -426,7 +426,7 @@ a.missing-copayers { ul.tx-copayers { background: #E4E8EC; - padding: 0.8rem; + padding: 0.3rem 0.8rem; margin-left: 0; box-shadow: inset 0 1px 1px 0 rgba(10,19,28,.12); border-radius: 0 0 3px 3px; From e6815339ab39bd920e1e32418b39de2f1da75946 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 13:55:06 -0300 Subject: [PATCH 08/10] fix History when there is not transactions --- js/controllers/history.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/controllers/history.js b/js/controllers/history.js index 82c387d12..90b33c783 100644 --- a/js/controllers/history.js +++ b/js/controllers/history.js @@ -90,8 +90,10 @@ angular.module('copayApp.controllers').controller('HistoryController', if (!err && res) { _.each(res, function(r) { var tx = index[r.ts]; - var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null); - tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null; + if (tx) { + var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null); + tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null; + } }); setTimeout(function() { $scope.$digest(); From b40dad21152d2d6edb8b6beb690bc292e20e9a78 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 13:55:42 -0300 Subject: [PATCH 09/10] fix history crown icon --- views/history.html | 1 - 1 file changed, 1 deletion(-) diff --git a/views/history.html b/views/history.html index 074636da7..1f6ee583b 100644 --- a/views/history.html +++ b/views/history.html @@ -103,7 +103,6 @@
    From 2dfff4b4afc7b22fa417186396809d826f399e51 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 13:58:27 -0300 Subject: [PATCH 10/10] rollbacks history (fixed in another pull request) --- js/controllers/history.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/controllers/history.js b/js/controllers/history.js index 90b33c783..82c387d12 100644 --- a/js/controllers/history.js +++ b/js/controllers/history.js @@ -90,10 +90,8 @@ angular.module('copayApp.controllers').controller('HistoryController', if (!err && res) { _.each(res, function(r) { var tx = index[r.ts]; - if (tx) { - var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null); - tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null; - } + var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null); + tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null; }); setTimeout(function() { $scope.$digest();
    {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    + + - - - - - - - + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
    - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}