diff --git a/public/index.html b/public/index.html index a913a4c5d..613e465c5 100644 --- a/public/index.html +++ b/public/index.html @@ -13,8 +13,6 @@ -
-
diff --git a/public/views/splash/1.html b/public/views/splash/1.html index 2d89df905..f061b7840 100644 --- a/public/views/splash/1.html +++ b/public/views/splash/1.html @@ -1,4 +1,4 @@ -
+
@@ -12,6 +12,8 @@
- +
+ +
diff --git a/src/css/main.css b/src/css/main.css index b1ff6d95f..8442c7a0f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -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 { diff --git a/src/js/routes.js b/src/js/routes.js index 506b0d1a7..7ceea95a4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -21,49 +21,11 @@ angular url: '/splash', needProfile: false, views: { - 'splash': { - template: '
', - 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; + } } } })