From c4b179f6f2c12275ec56ca9cd9c6395b1d0fd57d Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 27 Apr 2015 09:27:32 -0300 Subject: [PATCH 1/3] fix button size on modal --- public/views/modals/tx-status.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 1c80aaffc..5dc2bacda 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -5,7 +5,7 @@ Payment Sent
- OKAY + OKAY
@@ -15,7 +15,7 @@ {{statusStr|translate}}
- OKAY + OKAY
@@ -25,8 +25,6 @@ {{statusStr|translate}}
- OKAY + OKAY
- - From 30ce436d1cac95b9344f78762d7129cd4c3c47f8 Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 28 Apr 2015 13:58:19 -0300 Subject: [PATCH 2/3] fix bugs layout --- public/views/modals/txp-details.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 66b39c632..61f6a9ad2 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -132,14 +132,14 @@
+
+ * Only transactions created by yourself with no peer signatures can be removed +
-
- * Only transactions created by yourself with no peer signatures can be removed -
From 7b99f507843abd0fa4d9b6e48a6892d0d9b5ea31 Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 28 Apr 2015 18:15:25 -0300 Subject: [PATCH 3/3] improve spend proposal pending --- public/views/includes/transaction.html | 33 +++++++++++++++----------- src/css/main.css | 6 +++++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index b11e2ad41..2601cbc4f 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -1,12 +1,16 @@ -
-
- +
+ +  
-
-
- +
+
+ Send {{tx.amountStr}} + +
+
To: {{tx.merchant.domain}} @@ -14,12 +18,13 @@ {{tx.toAddress}} -
- -
- - {{tx.amountStr}} - -
+
+
+ {{tx.message}} +
+
+
+
+
diff --git a/src/css/main.css b/src/css/main.css index 6d5bffa48..2608908b3 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -470,6 +470,11 @@ input[type=number]::-webkit-outer-spin-button { padding: 0.3rem 0.4rem; } +.label.outline { + background: transparent; + border: 1px solid #4B6178; +} + .label.success {background-color: #1ABC9C;} .label.alert {background-color: #ED4A43;} .label.gray {background-color: #4B6178;} @@ -545,6 +550,7 @@ label { font-weight: 700; font-size: 11px; color: #34495E; + margin-bottom: 2px; } button.radius, .button.radius {