From 1b0ddadf4397f817e33bd3216ba4f9a281ad05eb Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 1 Sep 2014 11:40:09 -0300 Subject: [PATCH 1/6] Intermediate screen --- views/includes/video.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/includes/video.html b/views/includes/video.html index 9c1b7e7b2..bbeca14e0 100644 --- a/views/includes/video.html +++ b/views/includes/video.html @@ -23,7 +23,7 @@
- Backup ready + Ready
From 002e1097dd0775556d7a3d5b49be5bff811049b2 Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 1 Sep 2014 12:37:14 -0300 Subject: [PATCH 2/6] share secret firefox --- css/src/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/src/main.css b/css/src/main.css index bbda4a577..4fbcae2a7 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1124,6 +1124,7 @@ a.text-warning:hover {color: #FD7262;} float: left; margin-left: 2rem; overflow-wrap: break-word; + word-wrap: break-word; width: 55%; text-align: left; } From 0ef47e5c4c81b67da008a9b5ee4451c8dafb4b2a Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 1 Sep 2014 14:44:30 -0300 Subject: [PATCH 3/6] addresses on receive - mobile --- css/src/mobile.css | 5 +++++ views/addresses.html | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index 9049147ea..05e37c635 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -127,5 +127,10 @@ display: none; } + .addresses .list-addr contact { + margin-left: 0; + font-size: 14px; + } + } diff --git a/views/addresses.html b/views/addresses.html index 3322b7b98..12e590f26 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -8,21 +8,21 @@
    -
  • +
  • -
    +
    -   +   change
    -
    +
    - + {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
    From 1523c552f8b6be3a56bb481c036f8054fef0396e Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 1 Sep 2014 14:55:18 -0300 Subject: [PATCH 4/6] fix placeholders in forms --- css/src/main.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 4fbcae2a7..564e8c59d 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -53,19 +53,19 @@ } ::-webkit-input-placeholder { - color: #7A8C9E; + color: #4D657C; } :-moz-placeholder { /* Firefox 18- */ - color: #7A8C9E; + color: #4D657C; } ::-moz-placeholder { /* Firefox 19+ */ - color: #7A8C9E; + color: #4D657C; } :-ms-input-placeholder { - color: #7A8C9E; + color: #4D657C; } #qr-canvas { display: none; } @@ -167,7 +167,7 @@ a:hover { -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; border: 0 !important; - color: #7A8C9E !important; + color: #fff !important; } .open select, @@ -177,7 +177,7 @@ a:hover { .settings select { background: #2C3E50 !important; border: 0 !important; - color: #7A8C9E !important; + color: #fff !important; } .page, .main { From 3208eeecba322763937bd88032c71f7e847ab35b Mon Sep 17 00:00:00 2001 From: bechi Date: Tue, 2 Sep 2014 12:07:05 -0300 Subject: [PATCH 5/6] fix copy addr button --- views/addresses.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/views/addresses.html b/views/addresses.html index 12e590f26..14bc1b0f5 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -13,7 +13,10 @@
      - + + + + change
    From 8485d839f5c9635dd8a770c089bd52e2f4ea3223 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 3 Sep 2014 10:39:48 -0300 Subject: [PATCH 6/6] . --- views/addresses.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/addresses.html b/views/addresses.html index 14bc1b0f5..6fbbf245e 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -16,7 +16,7 @@ - + change