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

Merge branch 'ref/design' into wip/design

Browse source
This commit is contained in:
Jason Dreyzehner 2016-10-06 11:10:28 -04:00
commit ca778d1d00
401 changed files with 6904 additions and 6962 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/walletDetails.js
View file

@ -100,7 +100,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.recreate = function() {
walletService.recreate($scope.wallet, function(err) {
$scope.init();
if (err) return;
$timeout(function() {
walletService.startScan($scope.wallet, function() {

2
src/js/directives/directives.js
View file

@ -154,8 +154,6 @@ angular.module('copayApp.directives')
link: function(scope, element, attrs) {
scope.$on("$ionicSlides.sliderInitialized", function(event, data) {
scope.slider = data.slider;
if(scope.slider.slides.length == 1)
scope.slider.lockSwipes();
scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[0] : null);
});

4
src/sass/views/onboarding/onboard-collect-email.scss
View file

@ -15,6 +15,10 @@ $relish-success: 1.3s;
margin-top: 0;
height: 101%;
}
.scroll {
height: 100%;
transform: translate3d(0px, 0px, 0px) scale(1) !important;
}
.success-message {
top: 30vh;
position: relative;