Merge pull request #5355 from cmgustavo/bug/nav-bar-blank

Fixes when swipe back, the nav bar become blank

Gruntfile.js

@@ -74,13 +74,9 @@ module.exports = function(grunt) {
           grunt.log.writeln('Waiting for more changes...');
         },
       },
-      css: {
-        files: ['src/css/*.css'],
-        tasks: ['concat:css']
-      },
       sass: {
         files: ['src/sass/**/**/*.scss'],
-        tasks: ['sass', 'concat:css']
+        tasks: ['sass']
       },
       main: {
         files: [
@@ -104,8 +100,9 @@ module.exports = function(grunt) {
         },
         files: [{
           expand: true,
+          flatten: true,
           src: ['src/sass/main.scss'],
-          dest: './',
+          dest: 'www/css/',
           ext: '.css'
         }]
       }
@@ -132,7 +129,7 @@ module.exports = function(grunt) {
           'angular-bitauth/angular-bitauth.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'
         ],
-        dest: 'www/lib/angular.js'
+        dest: 'www/lib/angular-components.js'
       },
       js: {
         src: [
@@ -152,11 +149,7 @@ module.exports = function(grunt) {
           'node_modules/bezier-easing/dist/bezier-easing.min.js',
           'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js'
         ],
-        dest: 'www/js/copay.js'
-      },
-      css: {
-        src: ['src/sass/*.css', 'src/css/*.css'],
-        dest: 'www/css/copay.css'
+        dest: 'www/js/app.js'
       }
     },
     uglify: {
@@ -165,8 +158,8 @@ module.exports = function(grunt) {
       },
       prod: {
         files: {
-          'www/js/copay.js': ['www/js/copay.js'],
-          'www/lib/angular.js': ['www/lib/angular.js']
+          'www/js/app.js': ['www/js/app.js'],
+          'www/lib/angular-components.js': ['www/lib/angular-components.js']
         }
       }
     },

app-template/index.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="msapplication-tap-highlight" content="no">
   <meta name="format-detection" content="telephone=no">
-  <link rel="stylesheet" type="text/css" href="css/copay.css">
+  <link rel="stylesheet" type="text/css" href="css/main.css">
   <title>*USERVISIBLENAME* - *PURPOSELINE*</title>
   <link rel="shortcut icon" href="img/app/favicon.ico">
 </head>
@@ -25,11 +25,11 @@
   </ion-nav-view>
 
   <script src="lib/ionic.bundle.min.js"></script>
-  <script src="lib/angular.js"></script>
+  <script src="lib/angular-components.js"></script>
 
   <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
-  <script src="js/copay.js"></script>
+  <script src="js/app.js"></script>
 
 </body>
 </html>

src/sass/ionic.scss

@@ -12,6 +12,8 @@ ion-tabs.ion-tabs-transparent {
   background: none transparent;
 }
 
+ion-nav-bar.hide { display: block !important; }
+
 // .placeholder-icon padding cannot be modified by a variable
 $placeholder-icon-padding: 10px;
 .placeholder-icon {