diff --git a/css/src/main.css b/css/src/main.css index 1720f41f0..ae1973e6c 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -404,26 +404,64 @@ a:hover { background-color: #C0392A; } +.panel.last-transactions { + padding: 0; + margin-bottom: 2.25rem; + border-radius: 3px 3px 0 3px; +} -.last-transactions { - margin-bottom: 2rem; - background-color: #E8EAEF; +a.missing-copayers { + background: #7A8C9E; + position: absolute; + display: block; + right: -1px; + bottom: -18px; + 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.3rem 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 { + list-style: none; + padding: 0.3rem; + font-size: 12px; +} + +.tx-copayers li.bottom-line-copayers { + border-bottom: 1px solid #CAD2DA; } .last-transactions-header { - padding: 0.5rem; + border-radius: 3px 3px 0 0; + 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 { + padding: 0.8rem 0.8rem 0; + color: #7A8C9E; } .last-transactions-footer { - padding: 0.5rem; + padding: 0.8rem; overflow: hidden; } -table.last-transactions-content { - background-color: #F8F8FB; - margin-bottom: 10px; -} - .last-transactions-content .box-status { font-size: 13px; width: 30px; @@ -446,36 +484,27 @@ table.last-transactions-content { color: #fff; } -.last-transactions-content .icon-active-check { +.icon-sign { + padding: 0.2rem 0.3rem; + border-radius: 100%; + color: #fff; + margin-right: 7px; +} + +.icon-sign.check { background-color: #3FBC9C; - color: #fff; } -.last-transactions-content .icon-active-x { +.icon-sign.x { background-color: #C0392B; - 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 +514,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 +635,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; } @@ -998,8 +1023,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 */ @@ -1374,15 +1399,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; } @@ -1456,9 +1472,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..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 { @@ -221,10 +226,6 @@ padding: 0.15rem 0.2rem; } - .line-t { - border-top: 1px solid #3C5269; - } - } @media (max-width: 640px) { 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/history.html b/views/history.html index eaa23f302..1f6ee583b 100644 --- a/views/history.html +++ b/views/history.html @@ -96,21 +96,15 @@ - - - - + + + diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 190af0997..78893e0af 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,114 +1,116 @@ -
- {{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)}} - - - - - - -
- + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
- - - - - - - - -
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} - - - - - - - - - - -
-
-
+
+
+ +
+
+ +
-
-
-
- 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}}
+ + + + + One signature missing + + + + {{tx.missingSignatures}} signatures missing + + + Copayers + + + + +
    +
  • + + + + + + + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    • +
+ diff --git a/views/send.html b/views/send.html index 8b4b60617..5804b0027 100644 --- a/views/send.html +++ b/views/send.html @@ -2,7 +2,7 @@

Pending Transactions Proposals

-
@@ -88,7 +88,7 @@