diff --git a/css/src/main.css b/css/src/main.css index a8b52a752..1edd778a3 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -248,26 +248,35 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu color: #FFF; } -.side-nav.wallets .avatar-wallet, -.wallet-selection.wallets .avatar-wallet +.home-wallet .wallet-info { + margin-left: 0; + line-height: 110%; + float: left; + } + +.side-nav.wallets .avatar-wallet { - background-color: #1ABC9C; - color: #fff; padding: 0.35rem 0.5rem; text-align: center; - margin-top: 3px; + margin-top: 5px; width: 35px; } +header .avatar-wallet { + background-color: #fff; + color: #1ABC9C; +} + + .avatar-wallet { + background-color: #1ABC9C; + color: #fff; font-size: 20px; font-weight: 700; margin-top: 10px; margin-left: 10px; margin-right: 8px; padding: 0.5rem 0.65rem; - background-color: #fff; - color: #1ABC9C; line-height: 24px; text-align: center; } diff --git a/css/src/mobile.css b/css/src/mobile.css index d55eb1b89..4c8d88045 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -143,6 +143,14 @@ text-align: center; } + .amount { + background-color: #F1F3F5; + width: 100%; + text-align: center; + padding: 2.4rem 1rem; + margin-bottom: 15px; + } + .scroll-section { position: absolute; top: 120px; @@ -184,15 +192,19 @@ height:100%; } - .avatar-wallet { - background-color: #1ABC9C; - color: #fff; - margin-top: 5px; - margin-left: 5px; - margin-right: 13px; - padding: 0.35rem 0.65rem; + .home-wallet .avatar-wallet { + padding: 1.7rem; + width: 90px; + height: 90px; + position: absolute; + top: -43px; + font-size: 35px; + border: 3px solid #fff; } + .home-wallet .wallet-info { + margin-left: 100px; + } .copayers { position: relative; @@ -321,9 +333,13 @@ background: #E4E8EC; } + .sidebar-mobile-wallets .avatar-wallet { + margin-top: 5px; + } + .sidebar-mobile-wallets li { overflow: hidden; - padding:0.4rem; + padding:.6rem 0.4rem; border-bottom: 1px solid #DDE2E7; } diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index f6b9ab372..ab1ee5ff1 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -21,10 +21,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function( 'title': 'History', 'icon': 'icon-history', 'link': 'history' - }, { - 'title': 'Settings', - 'icon': 'icon-gear', - 'link': 'more' }]; $scope.signout = function() { diff --git a/views/copayers.html b/views/copayers.html index 2a09dcfea..d499f210d 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -6,7 +6,7 @@
-
+
@@ -35,18 +35,21 @@
+
+

Waiting for copayers

-
- -

+

+
+

Waiting...

+
diff --git a/views/homeWallet.html b/views/homeWallet.html index f412f3554..06b5f13cb 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -4,51 +4,43 @@

Home

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

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

-
-
-
-
- - - {{$root.wallet.balanceInfo.totalBalance || 0}} - - {{$root.wallet.settings.unitName}} - - - - {{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} - N/A - - -
-
+
+ + + {{$root.wallet.balanceInfo.totalBalance || 0}} + + {{$root.wallet.settings.unitName}} + + + + {{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} + N/A + +
- - -
- -
-
- Personal Wallet - - Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] - - in TESTNET +
+
{{$root.wallet.getName() | limitTo: 1}}
+
+

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

+
+ Multisignature wallet + Personal Wallet + Testnet
+
@@ -78,14 +70,5 @@
-
- -
-
-

Copayers

-
-
-
-
diff --git a/views/includes/copayers.html b/views/includes/copayers.html index be22ff6bb..3180d4b46 100644 --- a/views/includes/copayers.html +++ b/views/includes/copayers.html @@ -1,12 +1,11 @@ -
-
-
- +
    +
  • +
    +
    + +
    -
    +
    {{'Me'|translate}} @@ -14,5 +13,5 @@ {{copayer.nick}}
    -
    -
+ + \ No newline at end of file diff --git a/views/more.html b/views/more.html index a3b794679..227c46c98 100644 --- a/views/more.html +++ b/views/more.html @@ -22,9 +22,8 @@
- -
-
+
+

Wallet info

@@ -49,10 +48,16 @@
+
+

Copayers

+
+
+
+
-
+