From f98e606e90e3968940c1cfb38052a68ce44825fe Mon Sep 17 00:00:00 2001 From: Bechi Date: Mon, 26 May 2014 16:37:56 -0300 Subject: [PATCH 1/4] fix mobile interface --- css/main.css | 50 ++++++++++++++++++++++++++++++++++++--------- css/tpl-clean.css | 2 +- css/tpl-default.css | 4 ++-- index.html | 9 ++++---- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/css/main.css b/css/main.css index 037b80b42..8f36b2597 100644 --- a/css/main.css +++ b/css/main.css @@ -54,7 +54,7 @@ html, body {height: 100%;} position: relative; float: right; margin-left: 15px; - height: 62px; + /* height: 551px; */ } .logo { @@ -64,13 +64,6 @@ html, body {height: 100%;} margin: 0 auto; } -@media (max-width: 640px) { - .logo { - margin: 0 auto; - margin-bottom: 10px; - } -} - .top-bar-section li:not(.has-form) a:not(.button) { line-height: 60px; } @@ -129,7 +122,6 @@ html, body {height: 100%;} } .panel { - /* padding: 0.7rem 1rem; */ border:0; } @@ -155,7 +147,7 @@ html, body {height: 100%;} } .box-backup { - margin: 2rem 0; + margin: 0.6rem 0; padding: 2rem 1rem; } @@ -621,3 +613,41 @@ p.dr-notification-text { white-space: nowrap; } +@media only screen and (max-width: 40em) { + .top-bar { + background: #1ABC9C; + } + + .header-content { + padding: 0.3rem 0rem 1rem 0.4rem; + } + + .logo { + background-size: 90px 44px !important; + float: left; + margin-top: 0.7rem; + } + + .header-content .small-9 { + text-align: right !important; + } + + .header-content .line-dashed-v { + border: none !important; + } + + .header-content { + font-size: 80%; + line-height: 140%; + } + + .box-backup { + margin: 0.6rem 0; + } + + #footer { + font-size: 80%; + padding: 0.2rem 0.5rem; + } + +} \ No newline at end of file diff --git a/css/tpl-clean.css b/css/tpl-clean.css index 0df4a0644..a6b2c3581 100644 --- a/css/tpl-clean.css +++ b/css/tpl-clean.css @@ -1,5 +1,5 @@ .logo { - background: transparent url('../img/logo.png'); + background: transparent url('../img/logo.png') no-repeat; } #footer { diff --git a/css/tpl-default.css b/css/tpl-default.css index d2bf404c0..47e2494f7 100644 --- a/css/tpl-default.css +++ b/css/tpl-default.css @@ -38,8 +38,8 @@ body { } .logo { - background: transparent url('../img/logo-negative.svg'); - background-size: 131px 51px; + background: transparent url('../img/logo-negative.svg') no-repeat; + background-size: 130px 51px; } .top-bar-section li:not(.has-form) a:not(.button) { diff --git a/index.html b/index.html index 290ce3bba..2dec8136d 100644 --- a/index.html +++ b/index.html @@ -16,10 +16,10 @@
-
+
-
+
-
+
{{$root.wallet.getName()}}
@@ -347,7 +347,6 @@ - -
  • +
      +
    • +
    @@ -484,7 +484,7 @@
  • - +

    Last transactions

    @@ -499,7 +499,7 @@
    @@ -509,24 +509,24 @@
    -
    +
    -

    {{vin.addr}}

    - {{vin.value}} +

    {{vin.addr}}

    + {{vin.value}}
    -
    +
    -
    +
    -
    +
    -

    {{addr}}

    +

    {{addr}}

    -
    +
    {{vout.value}}
    @@ -535,9 +535,9 @@
    -
    Fees: {{btx.fees}}
    -
    Confirmations: {{btx.confirmations || 0}}
    -
    Total: {{btx.valueOut}}
    +
    Fees: {{btx.fees}}
    +
    Confirmations: {{btx.confirmations || 0}}
    +
    Total: {{btx.valueOut}}
    From 836faeee299ffa653c11876606410b759d9aae20 Mon Sep 17 00:00:00 2001 From: Bechi Date: Wed, 28 May 2014 17:51:49 -0300 Subject: [PATCH 3/4] login --- css/main.css | 4 ++++ index.html | 44 ++++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/css/main.css b/css/main.css index e364e6216..8c3a1def9 100644 --- a/css/main.css +++ b/css/main.css @@ -668,4 +668,8 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus { width: 71px; } + .alert-box.secondary { + margin: 0 1rem; + } + } \ No newline at end of file diff --git a/index.html b/index.html index feb0f42a5..7932431d4 100644 --- a/index.html +++ b/index.html @@ -270,18 +270,16 @@
    -
    -
    -
    -
    Select total number of copayers
    - -
    -
    -
    Select required signatures
    - -
    +
    +
    +
    Select total number of copayers
    + +
    +
    +
    Select required signatures
    +
    @@ -300,18 +298,16 @@
    Wallet name Optional
    -
    +
    Your name Optional
    -
    -
    - - Go back -
    +
    + + Go back
    @@ -349,10 +345,10 @@ - +
    @@ -488,8 +484,8 @@

    Last transactions

    - - + Show + Hide
    No transactions yet. From 9cc70398f1856b993d04084f0472b498bada2163 Mon Sep 17 00:00:00 2001 From: Bechi Date: Thu, 29 May 2014 15:55:30 -0300 Subject: [PATCH 4/4] sign-up --- css/main.css | 4 ---- index.html | 30 +++++++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/css/main.css b/css/main.css index 8c3a1def9..e364e6216 100644 --- a/css/main.css +++ b/css/main.css @@ -668,8 +668,4 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus { width: 71px; } - .alert-box.secondary { - margin: 0 1rem; - } - } \ No newline at end of file diff --git a/index.html b/index.html index 52380d704..0135f5e4c 100644 --- a/index.html +++ b/index.html @@ -84,6 +84,7 @@
    +
    Not all copayers have joined your wallet yet. @@ -95,20 +96,23 @@ yet to join.
    - -
    -

    Share this secret with your other copayers - for them to join your wallet -

    -
    -
    -
    -

    {{$root.wallet.getSecret()}}

    +
    + +
    +
    +

    Share this secret with your other copayers + for them to join your wallet +

    +
    +
    +
    +

    {{$root.wallet.getSecret()}}

    +
    +
    +
    +
    {{$root.wallet.getName()}}
    +

    {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet

    -
    -
    -
    {{$root.wallet.getName()}}
    -

    {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet