anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from bechi/gabriel/ui

Browse source 
add style on disclaimer
This commit is contained in:
Gabriel Edgardo Bazán 2015-11-16 17:08:09 -03:00
commit 003a2a95a2
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
public/views/disclaimer.html
View file

@ -1,22 +1,20 @@
<div class="splash content text-center" <div class="splash content text-center"
ng-init="init()" ng-init="init()"
ng-controller="disclaimerController"> ng-controller="disclaimerController">
<div ng-if="!agreed"> <div ng-if="!agreed">
<div class="row"> <div class="row">
<div class="medium-centered small-centered large-centered columns"> <div class="container-image large-2 medium-2 small-2 medium-centered small-centered large-centered columns">
<div class="m20t">
<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>
</div>
</div>
<div class="row">
<div class="container-image large-3 medium-3 small-3 medium-centered small-centered large-centered columns">
<img src="img/icon-splash.png" alt="icon" width="100%"> <img src="img/icon-splash.png" alt="icon" width="100%">
</div> </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>
</div>
<div class="row"> <div class="row">
<div class="scrollArea"> <div class="scrollArea">
<p class="enable_text_select size-14"> <p class="enable_text_select m0">
<ul> <ul>
<li translate>The software you are about to use functions as a free, open source, and multi-signature digital wallet.</li> <li translate>The software you are about to use functions as a free, open source, and multi-signature digital wallet.</li>
<li translate>The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.</li> <li translate>The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin.</li>
@ -56,15 +54,13 @@
</p> </p>
</div> </div>
<div ng-show="!agreed"> <div ng-show="!agreed">
<p translate>I affirm that I have read, understood, and agree with these terms.</p> <p class="text-gray columns" translate>I affirm that I have read, understood, and agree with these terms.</p>
</div> </div>
<div class="row" ng-show="!creatingProfile"> <div class="row" ng-show="!creatingProfile">
<div class="start-button large-8 medium-8 small-8 medium-centered small-centered large-centered columns"> <div class="start-button columns">
<button ng-click="create()" class="button black expand round size-12 text-spacing" translate> <button ng-click="create()" class="button black expand round size-12 text-spacing" translate>
GET STARTED GET STARTED
</button> </button>
<p class="text-gray m5b size-12" translate>Already have a wallet?</p>
<button ng-click="create(true)" class="button round outline dark-gray tiny" translate>Import backup </button>
</div> </div>
</div> </div>
</div> </div>

14
src/css/main.css
View file

@ -1096,6 +1096,18 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.scrollArea { .scrollArea {
height: 280px; height: 280px;
overflow: scroll; overflow: scroll;
background: #213140;
border: 1px solid #4B6178;
border-radius: 5px;
margin: 1.6rem;
color: #A5B2BF;
line-height: 30px;
padding: 0.5rem;
}
.scrollArea ul {
font-size: 0.8rem;
text-align: left;
} }
.tabbable { .tabbable {
@ -1203,7 +1215,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
} }
.splash .container-image { .splash .container-image {
padding: 2rem 0; padding: 1rem 0;
} }
.preferences li { .preferences li {