From 041b2c615fe2a3da3ecc749922b0fe302ec9028b Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 12 Dec 2014 02:21:32 -0300 Subject: [PATCH] add style on popup --- css/src/main.css | 28 ++++-- css/src/mobile.css | 13 +++ views/modals/txp-details.html | 178 ++++++++++++++++++---------------- 3 files changed, 124 insertions(+), 95 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 9523b610a..c166f6563 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -803,6 +803,13 @@ input[type=number]::-webkit-outer-spin-button { background-color: #A02F23; } +.txp-popup .header { + background: #F3F5F6; + width: 100%; + padding: 0.8rem; + position: relative; +} + .addresses .label { font-weight: normal; padding: .2rem .3rem; @@ -1608,14 +1615,17 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .reveal-modal .close-reveal-modal, dialog .close-reveal-modal { - padding: 5px 10px; - position: relative; - font-weight: normal; - border: 1px solid #bbb; - font-size: 22px; - background:#eee; - right:0; - top:0; - text-transform: uppercase; + padding: 0.8rem; + position: absolute; + background: #E4E8EC; + top: 37px; + right: 15px; + line-height: 0; + color: #7A8C9E; + border-radius: 3px; } +.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover { + background-color: #7A8C9E; + color: #fff; +} diff --git a/css/src/mobile.css b/css/src/mobile.css index a3c3a5f1c..81134430a 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -52,6 +52,10 @@ padding: 1rem 0; } + .reveal-modal { + padding: 0.5rem; + } + header { height: 45px; line-height: 110%; @@ -290,5 +294,14 @@ 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 f7be43a79..1bc60289e 100644 --- a/views/modals/txp-details.html +++ b/views/modals/txp-details.html @@ -1,94 +1,100 @@ - -
- Close -
- -
-
-
- {{out.value}} {{$root.wallet.settings.unitName}} +
+
+
+ + + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + + + +
-
- {{out.alternativeAmount}} {{out.alternativeIsoCode}} + +
+
+ {{out.value}} {{$root.wallet.settings.unitName}} +
+ + {{out.alternativeAmount}} {{out.alternativeIsoCode}} + +
+ +
+ +
+
+

Bechilandia@gmail.com

+
+ +
+
+
+ {{tx.comment}}
-
-
- To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} +
+
+

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}} - - + × +
+ +
+
+ +
+
+ +
-
- - -
- -
- Note: {{tx.comment}} -
- - -
- Merchant Message: {{tx.merchant.pr.pd.memo}} -
-
- Expires: {{tx.merchant.expirationDate | amTimeAgo }} -
- -
- Signatures: -
    -
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
-
-
- -
-
- -
- - {{error}} - - × -
- -
-
- -
-
- -
-
- -