diff --git a/css/src/main.css b/css/src/main.css index 5777adcd1..efae2e357 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -279,11 +279,11 @@ a:hover { } .last-transactions-header { - padding: 1rem; + padding: 0.5rem; } .last-transactions-footer { - padding: 1rem; + padding: 0.5rem; overflow: hidden; } @@ -293,6 +293,13 @@ a:hover { background: #CED3DB; } +table.last-transactions-content { + padding: 0; + border: 0; + background-color: #fff; + margin: 0; +} + .last-transactions-content .box-status { font-size: 13px; width: 30px; @@ -311,24 +318,41 @@ a:hover { border: 2px solid #7A8C9B; } -.last-transactions-content .box-copayer .icon-active { +.last-transactions-content .icon-active { color: #fff; } -.last-transactions-content .box-copayer .icon-active-check { +.last-transactions-content .icon-active-check { background-color: #3FBC9C; color: #fff; } -.last-transactions-content .box-copayer .icon-active-x { +.last-transactions-content .icon-active-x { background-color: #C0392B; color: #fff; } -.last-transactions-header .label, .last-transactions-footer .label { - white-space: normal; - text-align: left; - line-height: 1.2rem; +.private-message { + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px solid #fff; + line-height: 20px; +} + +.header-message { + background-color: #F8F8FB; + height: 18px; +} + +.date-message { + background-color: #3C4E60; + color: #fff; + 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; } .input-note { diff --git a/css/src/mobile.css b/css/src/mobile.css index 4dcbd24ff..158b9f5b4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -157,5 +157,19 @@ padding: 0 5px; } + table.last-transactions-content td { + text-align: center; + } + + table.last-transactions-content td.copayer-name { + text-align: left; + } + + table.last-transactions-content .icon-status { + border-radius: 0; + padding: 0.1rem 0.3rem; + margin-bottom: 0; + } + } diff --git a/views/includes/transaction.html b/views/includes/transaction.html index a24afa6fe..344c7c962 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,19 +1,13 @@ +
+ {{tx.createdTs | amCalendar}} +
+
+ + {{tx.comment}} +
- -
-

- {{tx.comment}} Created by {{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}} -

-
-
+
@@ -39,13 +33,33 @@
-
+

{{tx.createdTs | amCalendar}}

- -
+ + + + + + + + + +
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} + + + + + + + + + + +
+