BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #514 from gabrielbazan7/fix/scroll 

fix scroll of terms in ios
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-17 17:09:09 -03:00 committed by GitHub
parent ffa30ebba7 a2797831da
commit c02eaa6110
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sass/views/onboarding/terms-of-use.scss
View File

@ -11,6 +11,7 @@
ion-content{
padding-top: 1.5rem;
color: $dark-gray;
margin-bottom: 210px;
p {
padding: 0 2.5%;
margin: 2rem auto;
@ -25,6 +26,9 @@
position: absolute;
bottom: 0;
width: 100%;
.text-center {
text-align: center;
}
.checkbox input:before,
.checkbox .checkbox-icon:before {
border-radius: 50% !important;
@ -54,15 +58,13 @@
width: 10%;
position: relative;
padding-right: 0;
top: 25px;
padding-left: 50px;
.item-content {
white-space: normal;
}
}
p {
color: rgb(58, 58, 58);
float: left;
width: 80%;
}
.checkbox input:before,
.checkbox .checkbox-icon:before {

26
www/views/modals/terms.html
View File

@ -7,13 +7,23 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header" scroll="false">
<ion-scroll ng-include="'views/includes/terms.html'" direction="y" ng-style="{'height': '60%'}"></ion-scroll>
<div id="agree-to-terms">
<a ng-click="openExternalLink('https://copay.io/disclaimer', true, 'View Terms of Service', 'The official English Terms of Service are available on the BitPay website. Would you like to view them?', 'Open Website', 'Go Back')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
<p translate>I have read, understood, and agree with the Terms of use.</p>
<button ng-disabled="!terms.accept3" class="button button-block button-positive" ng-click="termsModal.hide(); confirm()" translate>Confirm & Finish</button>
</div>
<ion-content class="has-header">
<div ng-include="'views/includes/terms.html'" direction="y"></div>
</ion-content>
<div id="agree-to-terms">
<div class="text-center">
<a ng-click="openExternalLink('https://copay.io/disclaimer', true, 'View Terms of Service', 'The official English Terms of Service are available on the BitPay website. Would you like to view them?', 'Open Website', 'Go Back')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
</div>
<div class="row">
<div class="col col-20">
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
</div>
<div class="col col-80">
<p translate>I have read, understood, and agree with the Terms of use.</p>
</div>
</div>
<div class="text-center">
<button ng-disabled="!terms.accept3" class="button utton-block button-positive" ng-click="termsModal.hide(); confirm()" translate>Confirm & Finish</button>
</div>
</div>
</ion-modal-view>