diff --git a/css/src/main.css b/css/src/main.css index c9110c4d3..e2dc11367 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -144,9 +144,12 @@ header .alt-currency { right: 0; } -.head .title h1 { +.head .title { float: left; padding-left: 2rem; +} + +.head .title h1 { margin: 0; } @@ -349,7 +352,7 @@ a:hover { .main { margin-left: 250px; - padding: 100px 2rem; + padding: 100px 1rem; background-color: #F8F8FB; } @@ -655,11 +658,7 @@ input[type=number]::-webkit-outer-spin-button { } .spinner { - display:inline-block; - width: 1em; - text-align:center; - line-height:1em; - vertical-align:middle; + display: inline-block; } .highlight{ @@ -1134,6 +1133,7 @@ button.gray:focus, border-radius: 100%; vertical-align: middle; overflow: hidden; + text-align: center; } a:hover .photo-container { @@ -1205,19 +1205,10 @@ a:hover .photo-container { cursor: pointer; } -.copay-box-small { - width: 45px; - text-align: center; - margin-right: 10px; - padding-bottom: 5px; - float: left; -} - .copay-box { width: 70px; text-align: center; margin-right: 20px; - padding-bottom: 5px; float: left; } @@ -1264,26 +1255,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus { border-color: red; } -.copayers h3, .copayers h4, .waiting-copayers h4 { - color: #fff; - font-weight: 100; -} - -.copayers { - width: 100%; - background-color: #213140; - /* position: absolute; */ - /* bottom: 0; */ - /* left: 0; */ - padding: 20px; - border-top: 1px solid #475065; - /* overflow-y: hidden; */ -} - -.copayers i { - opacity: 0.6; -} - .black { background-color: #2C3E50; } @@ -1321,6 +1292,11 @@ a.text-warning:hover {color: #FD7262;} margin-top: 15%; } +.loading-screen .spinner { + vertical-align: middle; + margin-right: 15px; +} + .box-setup .panel { background-color: #2C3E50; padding: 1rem; @@ -1363,24 +1339,18 @@ a.text-warning:hover {color: #FD7262;} } .panel qrcode { - float: left; - width: 160px; - height: 160px; - padding: 5px 0 0 5px; background-color: white; } .panel qrcode canvas { - width: 150px; - height: 150px; + width: 250px; + height: 250px; } .panel .secret { - float: left; - margin-left: 2rem; overflow-wrap: break-word; word-wrap: break-word; - text-align: left; + text-align: center; } .panel { diff --git a/css/src/mobile.css b/css/src/mobile.css index 0795d9a02..8f04fb956 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -116,27 +116,6 @@ color: white; } - .panel .secret { - padding-top: 0.5rem; - display: block; - width: 100%; - margin-left: 0; - text-align: center; - } - - .panel qrcode { - display: block; - float: none; - margin: 0 auto; - width: 160px; - height: 160px; - } - - .panel qrcode canvas { - width: 150px; - height: 150px; - } - .addresses .panel { padding: 1rem 0.8rem; } diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index 13f202e79..15f68db16 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -2,7 +2,10 @@ angular.module('copayApp.controllers').controller('CopayersController', function($scope, $rootScope, $location, controllerUtils) { - $rootScope.title = 'Copayers'; + if (!$rootScope.wallet.isReady()) { + $rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName(); + } + $scope.loading = false; $scope.goToWallet = function() { controllerUtils.updateAddressList(); diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index 10f13be23..32ad7680a 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -6,17 +6,9 @@ angular.module('copayApp.controllers').controller('HomeWalletController', $rootScope.title = 'Home'; - if ($rootScope.addrInfos) { $scope.address = $rootScope.addrInfos[0]; } - $scope.copayersList = function() { - if ($rootScope.wallet) { - $scope.copayers = $rootScope.wallet.getRegisteredPeerIds(); - } - return $scope.copayers; - } - } ); diff --git a/views/copayers.html b/views/copayers.html index b72b5a1fa..51b60b26f 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -1,35 +1,37 @@ -
+
-
+

+ Waiting copayers for {{$root.wallet.getName()}} + {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} +

+
-
-

- Waiting copayers for - {{$root.wallet.getName()}} - {{$root.wallet.requiredCopayers}}-{{'of'|translate}}-{{$root.wallet.totalCopayers}} +
+
+

+ Share this secret with your other copayers + {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}

-
- -
-

Share this secret with your other copayers

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

- - Waiting... -

-
-
+
+
+
+
+ +

+ + Waiting... +

+

diff --git a/views/home.html b/views/home.html index 64535a00c..1393c0f51 100644 --- a/views/home.html +++ b/views/home.html @@ -4,7 +4,7 @@ Accessing your profile...
-
+
Copay
diff --git a/views/homeWallet.html b/views/homeWallet.html index 1b500a43c..f566788fd 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -1,19 +1,32 @@
-

Home

+

Home

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

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

-
-
- {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} +
+
+
+
+
+
{{$root.wallet.getName() | limitTo: 1}}
+

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

+
+
+
+ + + {{totalBalance || 0 |noFractionNumber}} + + {{$root.wallet.settings.unitName}} + + + + {{totalBalanceAlternative |noFractionNumber:2}} + + {{alternativeIsoCode}} + +
+
+
@@ -40,28 +53,15 @@
- - -

Copayers

-
- -
- - {{'Me'|translate}} - {{copayer.nick}} -
-
Ready
-
+
+
diff --git a/views/includes/copayer.html b/views/includes/copayer.html index 7b01e26e4..2af6f63b1 100644 --- a/views/includes/copayer.html +++ b/views/includes/copayer.html @@ -6,10 +6,11 @@ tooltip="ID: {{copayer.peerId}}" tooltip-placement="bottom"> - {{'Me'|translate}} - {{copayer.nick}} + {{'Me'|translate}} + + + {{copayer.nick}} +
- -
Ready
diff --git a/views/includes/head.html b/views/includes/head.html index 2f5e8c247..1f8fdd24d 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -1,5 +1,15 @@
-

{{$root.title}}

+

+ {{$root.title}} + + + + + + + + +

@@ -17,11 +27,6 @@
- {{'Manage wallets' | translate }} -
-
- - - + {{'Manage wallets' | translate }}
diff --git a/views/includes/peer-list.html b/views/includes/peer-list.html deleted file mode 100644 index 76b2f7e93..000000000 --- a/views/includes/peer-list.html +++ /dev/null @@ -1,26 +0,0 @@ -
-

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

- -
- {{copayer.peerId}} - -
- {{'Me'|translate}} - {{copayer.nick}} -
-
-