Merge pull request #3693 from bitpay/v1.6

Updates master from v1.6
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-17 12:32:44 -03:00
commit 08a15ae52b
13 changed files with 55 additions and 33 deletions

View file

@ -1,24 +1,19 @@
<div class="splash content text-center"
<div class="splash extra-padding-bottom p20t content text-center"
ng-controller="disclaimerController as disclaimer" ng-init="disclaimer.init()">
<div class="row">
<div class="container-image large-2 medium-2 small-2 medium-centered small-centered large-centered columns">
<img src="img/icon-splash.png" alt="icon" width="100%">
</div>
<div class="row">
<div class="medium-centered small-centered large-centered columns">
<span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
<p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
<div class="medium-centered small-centered large-centered columns size-14">
<span class="text-bold text-white" translate>WELCOME TO COPAY</span>
<p class="text-gray m0 text-light" translate>A multisignature bitcoin wallet</p>
</div>
</div>
<div class="row">
<div class="scrollArea">
<p class="enable_text_select m0">
<div class="size-16 text-gray" translate>Terms of Use</div>
<div class="size-14 text-gray" translate>Terms of Use</div>
<div ng-include="'views/includes/terms.html'"></div>
</p>
</div>
</div>
</div>
<div class="row">
<p ng-show="disclaimer.lang != 'en'">
@ -26,7 +21,7 @@
</p>
</div>
<div>
<p class="text-gray columns" translate>I affirm that I have read, understood, and agree with these terms.</p>
<p class="text-gray columns size-12" translate>I affirm that I have read, understood, and agree with these terms.</p>
</div>
<div class="row">
@ -42,8 +37,8 @@
<span translate>Creating Wallet...</span>
</div>
</div>
<div class="start-button columns">
<button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing" translate>
<div class="start-button columns button-box">
<button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing m0" translate>
I AGREE. GET STARTED
</button>
</div>