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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/terms_of_use_updates

Browse source
This commit is contained in:
Jamal Jackson 2016-09-15 10:35:56 -04:00
commit a17ae9cf6a
6 changed files with 71 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/js/controllers/onboarding/backupWarning.js
View file

@ -1,16 +1,20 @@
'use strict';
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService) {
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService, $ionicModal) {
$scope.walletId = $stateParams.walletId;
$scope.openPopup = function() {
var backupWarningPopup = $ionicPopup.show({
templateUrl: "views/includes/backupWarningPopup.html",
scope: $scope,
});
$ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
scope: $scope,
backdropClickToClose: false,
hardwareBackButtonClose: false
}).then(function(modal) {
$scope.warningModal = modal;
$scope.warningModal.show();
});
$scope.close = function() {
backupWarningPopup.close();
$scope.warningModal.hide();
$state.go('onboarding.backup', {
walletId: $stateParams.walletId,
fromOnboarding: true

12
src/sass/views/includes/modals/modals.scss
View file

@ -11,8 +11,15 @@
padding: 1rem;
border-radius: .25rem .25rem 0 0;
min-height: 120px;
&-success {
background: url('../img/onboarding-success.svg') no-repeat center;
&-img{
height: 6rem;
background-size: contain;
margin-top: .3rem;
background-repeat: no-repeat;
background-position: center;
}
&-img-success {
background-image: url('../img/onboarding-success.svg');
height: 6rem;
background-size: contain;
margin-top: .3rem;
@ -45,3 +52,4 @@
}
@import "backup-confirm-modal";
@import "screenshot-warning-model";

7
src/sass/views/includes/modals/screenshot-warning-model.scss Normal file
View file

@ -0,0 +1,7 @@
#screenshot-warning-modal{
.popup-modal-header{
&-img{
background-image: url('../img/onboarding-no-screenshot.svg');
}
}
}