diff --git a/css/main.css b/css/main.css index 037b80b42..e364e6216 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; } @@ -328,7 +320,7 @@ hr { margin: 2.25rem 0;} .box-copayers figure { width: 51px; - height: 55px; + height: 63px; border-top-left-radius: 4px 4px; border-bottom-left-radius: 4px 4px; overflow: hidden; @@ -621,3 +613,59 @@ p.dr-notification-text { white-space: nowrap; } +ul.pagination li.current a { + background: #1ABC9C; +} + +ul.pagination li.current a:hover, ul.pagination li.current a:focus { + background: #16A085; +} + +@media only screen and (max-width: 40em) { + + #main, .header-content { + font-size: 80%; + line-height: 140%; + } + + .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; + } + + .box-backup { + margin: 0.6rem 0; + } + + #footer { + font-size: 80%; + padding: 0.2rem 0.5rem; + } + + .box-status { + height: 71px; + } + + .box-copayers figure { + height: 71px; + width: 71px; + } + +} \ 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 4fcec18d3..0135f5e4c 100644 --- a/index.html +++ b/index.html @@ -16,10 +16,10 @@
-
+
-
+
{{$root.wallet.getName()}} @@ -56,7 +56,7 @@ @@ -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

@@ -133,7 +137,7 @@
-
+
{{$root.wallet.getName()}}
@@ -191,9 +195,9 @@

Create a new wallet

-
-
-
-

Create new wallet

-
-
Select total number of copayers
- -
-
-
Select required signatures
- -
+
+

Create new wallet

+
+
Select total number of copayers
+ +
+
+
Select required signatures
+
@@ -309,13 +311,11 @@
-
-
- - Go back -
+
+ + Go back
@@ -351,13 +351,12 @@ - - +
@@ -396,9 +395,9 @@

Transaction proposals [Pending] ({{txs.length}})

-
    -
  • -
  • +
      +
    • +
    @@ -489,12 +488,12 @@
- +

Last transactions

- - + Show + Hide
No transactions yet. @@ -503,7 +502,7 @@
@@ -513,24 +512,24 @@
-
+
-

{{vin.addr}}

- {{vin.value}} +

{{vin.addr}}

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

{{addr}}

+

{{addr}}

-
+
{{vout.value}}
@@ -539,9 +538,9 @@
-
Fees: {{btx.fees}}
-
Confirmations: {{btx.confirmations || 0}}
-
Total: {{btx.valueOut}}
+
Fees: {{btx.fees}}
+
Confirmations: {{btx.confirmations || 0}}
+
Total: {{btx.valueOut}}