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

Fixes transition of splash and creating wallet

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-20 10:02:41 -03:00
commit a82f477c20
4 changed files with 12 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/index.html
View file

@ -13,8 +13,6 @@
</head>
<body ng-cloak class="ng-cloak">
<div ui-view="splash"></div>
<div class="page"
ng-controller="indexController as index"
ng-swipe-disable-mouse
@ -37,7 +35,7 @@
<section
ng-class="{'main': index.hasProfile, 'main-dark': !index.hasProfile, 'animation-left': index.swipeLeft,
ng-class="{'main': index.hasProfile, 'main-dark': mainDark, 'animation-left': index.swipeLeft,
'animation-right': index.swipeRight}"
ui-view="main"></section>
<div ui-view="menu"></div>

6
public/views/splash/1.html
View file

@ -1,4 +1,4 @@
<div class="panel text-center m15 splash">
<div class="text-center splash">
<div class="row">
<div class="medium-6 large-4 medium-centered small-centered large-centered columns">
<div class="m50b p20">
@ -12,6 +12,8 @@
<div class="line-b m20b"></div>
</div>
</div>
<button ng-click="$root.go('createProfile')" class="button black expand radius " translate> START </button>
<div class="row columns start-button">
<button ng-click="$root.go('createProfile')" class="button black expand radius " translate> START </button>
</div>
</div>

13
src/css/main.css
View file

@ -1079,18 +1079,9 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
font-weight: normal;
}
.panel.splash {
.splash .start-button {
position: absolute;
height: 93.8%;
z-index: 10;
}
.panel.splash button {
position: absolute;
bottom: 1rem;
left: 1rem;
width: 90.5%;
z-index: 9999;
bottom: 0;
}
.preferences li {

45
src/js/routes.js
View file

@ -21,49 +21,11 @@ angular
url: '/splash',
needProfile: false,
views: {
'splash': {
template: '<div ui-view="steps"></div>',
controller: function($state) {
$state.transitionTo('splash.one');
}
}
}
})
.state('splash.one', {
views: {
'steps': {
'main': {
templateUrl: 'views/splash/1.html'
}
}
})
.state('splash.two', {
views: {
'steps': {
templateUrl: 'views/splash/2.html'
}
}
})
.state('splash.three', {
views: {
'steps': {
templateUrl: 'views/splash/3.html'
}
}
})
.state('splash.four', {
views: {
'steps': {
templateUrl: 'views/splash/4.html'
}
}
})
.state('splash.five', {
views: {
'steps': {
templateUrl: 'views/splash/5.html'
}
}
})
.state('walletHome', {
url: '/',
walletShouldBeComplete: true,
@ -88,7 +50,10 @@ angular
needProfile: false,
views: {
'main': {
templateUrl: 'views/createProfile.html'
templateUrl: 'views/createProfile.html',
controller: function($scope) {
$scope.mainDark = true;
}
}
}
})