diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 61bf8443b..8047c62b6 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -22,32 +22,30 @@
{{tx.amountStr}}
{{tx.alternativeAmountStr}}
- -
-
+
The payment was removed by creator
+ +
+
+
Payment accepted, but not yet broadcasted
+ + +
+
+
Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
+
+
Payment Sent
+
Payment Rejected
+
-
-
-
Payment accepted, but not yet broadcasted
- - -
-
-
Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
-
-
Payment Sent
-
Payment Rejected
-
- -
- Warning: this transaction has unconfirmed inputs +
+ Warning: this transaction has unconfirmed inputs
@@ -73,61 +71,61 @@
- From - - - - - {{wallet.name}} + {{'From'|translate}} + + + + +
{{wallet.name}}
- Created by - + {{'Created by'|translate}} + {{tx.creatorName}}
- Memo - + {{'Memo'|translate}} + {{tx.message}}
- Fee - + {{'Fee'|translate}} + {{tx.feeStr}}
Payment details
-
  • - To - +
    + {{'To'|translate}} + {{tx.paypro.domain}} {{tx.paypro.domain}} -
  • -
  • - Expired - +
  • +
    + {{'Expired'|translate}} + - -
  • - Expires - +
  • +
    + {{'Expires'|translate}} + - -
  • - Merchant Message - {{tx.paypro.pr.pd.memo}} -
  • +
    +
    + {{'Merchant Message'|translate}} + {{tx.paypro.pr.pd.memo}} +
    Timeline
    @@ -151,16 +149,20 @@
    -
    + +
    * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
    -
    - diff --git a/src/sass/main.scss b/src/sass/main.scss index 4974b6297..916c8f500 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -594,6 +594,10 @@ ul.wallet-selection.wallets { margin-right: 40px; } +.m55r { + margin-right: 55px; +} + .m25r { margin-right: 25px; } diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 363466c94..28c1d977e 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -3,7 +3,7 @@ bottom: 100px; } .head { - padding-bottom: 55px; + padding-bottom: 30px; .sending-label{ line-height: 70px; font-size: 25px;