From 111dac1a0eeafca40fd29a05536b609b69a3e6be Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 4 Sep 2014 11:34:24 -0300 Subject: [PATCH 1/4] fix send section --- views/send.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/views/send.html b/views/send.html index cae16e3b9..6a351bf23 100644 --- a/views/send.html +++ b/views/send.html @@ -8,9 +8,10 @@

{{title}}

+
-
+
-
-
+
+
-
+
-
-
+
+
@@ -125,6 +126,7 @@
+
From a9bf9a25ab99c9ddc6aba4c9f5ce924e20fe2162 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 4 Sep 2014 12:50:27 -0300 Subject: [PATCH 2/4] fix transactions list --- views/transactions.html | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/views/transactions.html b/views/transactions.html index f91565fbe..cb0315da5 100644 --- a/views/transactions.html +++ b/views/transactions.html @@ -30,14 +30,14 @@ No transactions yet.
-
-
+
+
{{btx.txid}}
-
+
first seen at @@ -49,7 +49,7 @@
-
+
{{vin.value| noFractionNumber}} {{$root.unitName}}

@@ -57,10 +57,13 @@

-
+
-
+
+ +
+
{{vout.value| noFractionNumber}} {{$root.unitName}}

@@ -70,9 +73,13 @@

-
Fees: {{btx.fees | noFractionNumber}} {{$root.unitName}}
-
Confirmations: {{btx.confirmations || 0}}
-
Total: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}
+
+

Fees: {{btx.fees | noFractionNumber}} {{$root.unitName}}

+

Confirmations: {{btx.confirmations || 0}}

+
+
+

Total: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}

+
From ac6688a1824be8a7a2668f88fcd94834117d7b77 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 4 Sep 2014 17:03:54 -0300 Subject: [PATCH 3/4] sidebar-mobile + locked amount + signout in header mobile --- css/src/main.css | 1 + css/src/mobile.css | 8 +++++ index.html | 3 ++ views/includes/sidebar-mobile.html | 55 ++++++++++++++---------------- views/includes/sidebar.html | 3 +- 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 352e30ad2..82566a843 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -368,6 +368,7 @@ a:hover { .pr {position: relative;} .pa {position: absolute;} .m0 {margin: 0;} +.p0 {padding: 0 !important;} .db {display: block;} .size-12 { font-size: 12px; } .size-14 { font-size: 14px; } diff --git a/css/src/mobile.css b/css/src/mobile.css index 05e37c635..5b8f44afa 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -102,6 +102,14 @@ border-right: 1px solid #425568; } + .right-small { + border-left: 1px solid #425568; + } + + .right-small a { + color: white; + } + .panel .secret { padding-top: 0.5rem; display: block; diff --git a/index.html b/index.html index d3241cec2..570c9f7d6 100644 --- a/index.html +++ b/index.html @@ -19,6 +19,9 @@
+
+ +

diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index f71e5cf7a..2ce45fa58 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -6,36 +6,33 @@

-
-
-
- Balance - - - - {{totalBalance || 0 - |noFractionNumber}} {{$root.unitName}} - -
-
- Locked - - - - {{lockedBalance || 0|noFractionNumber}} {{$root.unitName}} -   -
-
-
+
+
+

+ {{$root.wallet.getName()}} + {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} +

+
+ Balance + + + + + {{totalBalance || 0 + |noFractionNumber}} {{$root.unitName}} + +
+
+ Locked + + + + {{lockedBalance || 0|noFractionNumber}} {{$root.unitName}} +   +
+
+
From 8fd6aa1eb03765c41cd70cc2d039b6da005cf3c9 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 4 Sep 2014 17:40:16 -0300 Subject: [PATCH 4/4] fix addres section --- css/src/main.css | 9 +++++++-- css/src/mobile.css | 4 ++++ views/addresses.html | 41 ++++++++++++++++++++--------------------- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 82566a843..7831e8d16 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -924,8 +924,8 @@ button, .button, p { .addresses .list-addr i { position: absolute; - top: -25px; - left: 6px; + top: -15px; + left: 0; cursor: pointer; } @@ -1195,5 +1195,10 @@ a.text-warning:hover {color: #FD7262;} padding: 50px; } +.collapse { + margin: auto; + max-width: 100%; +} + /*-----------------------------------------------------------------*/ diff --git a/css/src/mobile.css b/css/src/mobile.css index 5b8f44afa..9deb53219 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -131,6 +131,10 @@ height: 200px; } + .addresses .panel { + padding: 1rem 0.8rem; + } + .btn-copy { display: none; } diff --git a/views/addresses.html b/views/addresses.html index 6fbbf245e..5845c8b5b 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -7,30 +7,29 @@
-
    -
  • - -
    -
    -   - - +
    +
    +
    +
    +   + + + + + change +
    +
    + +
    + + + + + {{addr.balance || 0|noFractionNumber}} {{$root.unitName}} - - change
    - -
    - - - - - {{addr.balance || 0|noFractionNumber}} {{$root.unitName}} - -
    -
    • -
+
Show all