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

Merge pull request #123 from jamal-jackson/feature/terms_of_use_updates

Browse source 
Disclaimer and backup minor css update
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-15 14:57:12 -03:00 • committed by GitHub
commit 289bf48c96
5 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/confirmBackupPopup.html
View file

@ -1,6 +1,6 @@
<div id="backup-confirm-modal" class="popup-modal"> <div id="backup-confirm-modal" class="popup-modal">
<div class="popup-modal-header"> <div class="popup-modal-header">
<div ng-class="{'popup-modal-header-img-success': !backupError, 'popup-modal-header-img-fail': backupError}"></div> <div ng-class="{'popup-modal-header-img-success': !backupError, 'popup-modal-header-img-fail': backupError}" class="popup-modal-header-img"></div>
</div> </div>
<div class="popup-modal-content" ng-class="{'popup-modal-content-success': !backupError, 'popup-modal-content-fail': backupError}"> <div class="popup-modal-content" ng-class="{'popup-modal-content-success': !backupError, 'popup-modal-content-fail': backupError}">
<div class="text-center" ng-show="!backupError"> <div class="text-center" ng-show="!backupError">

2
public/views/modals/terms.html
View file

@ -3,7 +3,7 @@
<ion-nav-title>{{'Terms of Use' | translate}}</ion-nav-title> <ion-nav-title>{{'Terms of Use' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="termsModal.hide()"> <button class="button no-border" ng-click="termsModal.hide()">
{{'Close' | translate}} <i class="ion-ios-arrow-thin-left"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>

2
src/sass/views/onboarding/onboard-disclaimer.scss
View file

@ -48,7 +48,7 @@
width: 100%; width: 100%;
.item{ .item{
color:rgb(58,58,58); color:rgb(58,58,58);
padding-bottom: 1.6rem; padding-bottom: 2.5rem;
float: left; float: left;
.item-content{ .item-content{
white-space: normal; white-space: normal;

11
src/sass/views/onboarding/terms-of-use.scss
View file

@ -2,6 +2,11 @@
ion-header-bar { ion-header-bar {
background: #fff; background: #fff;
box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2); box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2);
.primary-buttons{
.button{
font-size: 2rem;
}
}
} }
ion-content{ ion-content{
padding-top: 1.5rem; padding-top: 1.5rem;
@ -36,17 +41,19 @@
.checkbox input:checked:after, .checkbox input:checked:after,
input:checked + .checkbox-icon:after { input:checked + .checkbox-icon:after {
border-color: rgb(19, 229, 182); border-color: rgb(19, 229, 182);
top: 20%;
left: 11%;
} }
.item { .item {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
padding-bottom: 1.2rem; padding-bottom: 1.2rem;
padding-bottom: 1.6rem; padding-bottom: 2.5rem;
float: left; float: left;
border: none; border: none;
width: 10%; width: 10%;
position: relative; position: relative;
padding-right: 0; padding-right: 0;
top: 30px; top: 50px;
.item-content { .item-content {
white-space: normal; white-space: normal;
} }

5
src/sass/views/wallet-backup-phrase.scss
View file

@ -74,6 +74,11 @@
margin: 5px auto 0; margin: 5px auto 0;
} }
} }
ion-content.has-tabs{
.cta-buttons, #select-phrase{
bottom:91px;
}
}
} }
@media (max-width: 400px) { @media (max-width: 400px) {