This commit is contained in:
bechi 2015-11-20 17:30:38 -03:00 committed by Javier
commit f64b99938a
3 changed files with 24 additions and 9 deletions

View file

@ -88,7 +88,7 @@
<div class="columns text-center"> <div class="columns text-center">
<button <button
ng-disabled="wordsC.credentialsEncrypted" ng-disabled="wordsC.credentialsEncrypted"
class="black round small expand" class="round expand"
ng-style="{'background-color':index.backgroundColor}" ng-style="{'background-color':index.backgroundColor}"
ng-click="wordsC.goToStep2();" ng-click="wordsC.goToStep2();"
translate>Continue translate>Continue
@ -100,10 +100,10 @@
## STEP 2 ## STEP 2
--> -->
<div ng-show="wordsC.step2" class="columns"> <div ng-show="wordsC.step2">
<div class="columns text-center"> <div class="columns text-center">
<h5>Confirm your wallet seed</h5> <h5>Confirm your wallet seed</h5>
<p class="p20 text-gray m0"> <p class="p20v text-gray m0">
Please tap the words in order to confirm your backup phrase is correctly written. Please tap the words in order to confirm your backup phrase is correctly written.
</p> </p>
<div class="panel words text-left" ng-class="{'enable_text_select': index.network == 'testnet'}"> <div class="panel words text-left" ng-class="{'enable_text_select': index.network == 'testnet'}">
@ -119,7 +119,7 @@
<div class="columns text-center"> <div class="columns text-center">
<button <button
ng-disabled="!wordsC.selectComplete" ng-disabled="!wordsC.selectComplete"
class="black round small expand" class="round expand"
ng-style="{'background-color':index.backgroundColor}" ng-style="{'background-color':index.backgroundColor}"
ng-click="wordsC.goToStep3();" ng-click="wordsC.goToStep3();"
translate>Continue translate>Continue
@ -143,7 +143,7 @@
<button <button
ng-disabled="!passphrase" ng-disabled="!passphrase"
ng-style="{'background-color':index.backgroundColor}" ng-style="{'background-color':index.backgroundColor}"
class="button black round expand" class="button round expand"
ng-click="wordsC.goToStep4();" ng-click="wordsC.goToStep4();"
translate>Continue translate>Continue
</button> </button>
@ -153,7 +153,7 @@
<!-- <!--
## STEP 4 ## STEP 4
--> -->
<div ng-show="wordsC.step4"> <div ng-show="wordsC.step4">
<div class="box-notification" ng-show="wordsC.backupNoOk"> <div class="box-notification" ng-show="wordsC.backupNoOk">
<span class="text-warning" translate> <span class="text-warning" translate>
@ -187,7 +187,7 @@
<div class="columns text-center m20t"> <div class="columns text-center m20t">
<button <button
ng-style="{'background-color':index.backgroundColor}" ng-style="{'background-color':index.backgroundColor}"
class="button black round expand" class="button round expand"
ng-click="wordsC.confirm();" ng-click="wordsC.confirm();"
translate>Finish translate>Finish
</button> </button>

View file

@ -367,6 +367,21 @@ ul.tx-copayers {
margin: 0 auto; margin: 0 auto;
} }
.receive .circle-icon {
padding: 0.2rem;
margin-bottom: 1rem;
}
.backup .circle-icon {
background: #fff;
padding: 0.2rem;
margin-bottom: 1rem;
}
.receive h5, .backup h5 {
font-weight: 500;
}
.date-message { .date-message {
background-color: #213140; background-color: #213140;
border-radius: 3px; border-radius: 3px;
@ -1005,6 +1020,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
text-transform: lowercase; text-transform: lowercase;
font-size: 0.8rem; font-size: 0.8rem;
margin: 5px; margin: 5px;
padding: 0.5rem;
} }
.backup button[disabled] { .backup button[disabled] {

View file

@ -133,8 +133,7 @@ angular.module('copayApp.controllers').controller('backupController',
} }
self.addButton = function(word) { self.addButton = function(word) {
var btnhtml = '<button class="button radius tiny"' + var btnhtml = '<button class="button radius tiny words"' +
'ng-style="{\'background-color\':index.backgroundColor}"' +
'data-ng-click="wordsC.removeButton($event)" id="_' + word + '" > ' + word + ' </button>'; 'data-ng-click="wordsC.removeButton($event)" id="_' + word + '" > ' + word + ' </button>';
var temp = $compile(btnhtml)($scope); var temp = $compile(btnhtml)($scope);
angular.element(document.getElementById('addWord')).append(temp); angular.element(document.getElementById('addWord')).append(temp);