diff --git a/css/src/mobile.css b/css/src/mobile.css index c39611451..181094d5b 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -25,9 +25,9 @@ .main { height: 92%; - margin-top: 40px; + margin-top: 30px; margin-left: 0; - margin-bottom: -40px; + margin-bottom: -30px; padding: 20px 0 80px 0; } @@ -53,6 +53,17 @@ line-height: 110%; } + header h1 { + color: #fff; + text-align: center; + } + + header h1.left-sidebar { + margin: 5px 10px; + text-align: left; + font-size: 16px; + } + .col3 a { height: 45px; padding: 12px 5px; @@ -63,6 +74,10 @@ left: 0; } + .right-off-canvas-menu { + background-color: #213140 ; + } + .left-off-canvas-menu { background: #E4E8EC; line-height: 24px; @@ -177,11 +192,6 @@ margin-left: 0; font-size: 14px; } - - .top-balance { - width: auto; - padding: 0 5px; - } a.missing-copayers { bottom: -34px; @@ -204,14 +214,7 @@ .footer-setup { margin-bottom: 50px; - } - - .side-nav.wallets { - padding: 0; - height: 100%; - left: 0; - top: 45px; - } + } ul.off-canvas-list li a:hover { background: transparent; @@ -222,6 +225,18 @@ padding: 0.15rem 0.2rem; } + .side-nav.wallets { + z-index: 100; + overflow-y: inherit; + position: inherit; + height: auto; + border-bottom: none; + } + + .photo-container { + margin-right: 5px; + } + } @media (max-width: 640px) { diff --git a/index.html b/index.html index 6e180ceda..5e34a1c52 100644 --- a/index.html +++ b/index.html @@ -60,18 +60,13 @@
-
- - - - - {{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}} - +
+
-

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

+ Copay

@@ -80,6 +75,10 @@
+ +
-
-
{{$root.wallet.getName() | limitTo: 1}}
-

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

+
+
+
{{$root.wallet.getName() | limitTo: 1}}
+

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

+
-
+
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index afafd2577..2a65761ea 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,115 +1,44 @@ -
+
-
-
-
{{$root.wallet.getName() | limitTo: 1}}
-
-
-
-
[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
-
-
{{$root.wallet.getName()}}
-
-
-
- Waiting for copayers... -
- -
- {{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}} - {{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} - N/A -
-
-
-
- -
- -
- - diff --git a/views/includes/walletbar-mobile.html b/views/includes/walletbar-mobile.html new file mode 100644 index 000000000..3bb309283 --- /dev/null +++ b/views/includes/walletbar-mobile.html @@ -0,0 +1,36 @@ + diff --git a/views/receive.html b/views/receive.html index 02abb6cd3..67a8ee907 100644 --- a/views/receive.html +++ b/views/receive.html @@ -8,23 +8,19 @@
-
-
-

My Bitcoin address:

-
- -
-

{{addr}}

-
-
-
- Generating new address... +
+

My Bitcoin address:

+
+ +
+

{{addr}}

-
-
- Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them. -
+
+ Generating new address... +
+
+ Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them.