apache
diff --git a/‎zeppelin-web/Gruntfile.js‎
Lines changed: 13 additions & 9 deletions b/‎zeppelin-web/Gruntfile.js‎
Lines changed: 13 additions & 9 deletions
diff --git a/‎zeppelin-web/app/app/home/home.html‎
Lines changed: 1 addition & 0 deletions b/‎zeppelin-web/app/app/home/home.html‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎zeppelin-web/app/components/navbar/navbar.controller.js‎
Lines changed: 2 additions & 0 deletions b/‎zeppelin-web/app/components/navbar/navbar.controller.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎…lin-web/app/assets/fonts/FontAwesome.otf‎ ‎zeppelin-web/app/fonts/FontAwesome.otf‎zeppelin-web/app/assets/fonts/FontAwesome.otf renamed to zeppelin-web/app/fonts/FontAwesome.otf b/‎…lin-web/app/assets/fonts/FontAwesome.otf‎ ‎zeppelin-web/app/fonts/FontAwesome.otf‎zeppelin-web/app/assets/fonts/FontAwesome.otf renamed to zeppelin-web/app/fonts/FontAwesome.otf
diff --git a/‎…b/app/assets/fonts/Simple-Line-Icons.eot‎ ‎…elin-web/app/fonts/Simple-Line-Icons.eot‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.eot renamed to zeppelin-web/app/fonts/Simple-Line-Icons.eot b/‎…b/app/assets/fonts/Simple-Line-Icons.eot‎ ‎…elin-web/app/fonts/Simple-Line-Icons.eot‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.eot renamed to zeppelin-web/app/fonts/Simple-Line-Icons.eot
diff --git a/‎…b/app/assets/fonts/Simple-Line-Icons.svg‎ ‎…elin-web/app/fonts/Simple-Line-Icons.svg‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.svg renamed to zeppelin-web/app/fonts/Simple-Line-Icons.svg b/‎…b/app/assets/fonts/Simple-Line-Icons.svg‎ ‎…elin-web/app/fonts/Simple-Line-Icons.svg‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.svg renamed to zeppelin-web/app/fonts/Simple-Line-Icons.svg
diff --git a/‎…b/app/assets/fonts/Simple-Line-Icons.ttf‎ ‎…elin-web/app/fonts/Simple-Line-Icons.ttf‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.ttf renamed to zeppelin-web/app/fonts/Simple-Line-Icons.ttf b/‎…b/app/assets/fonts/Simple-Line-Icons.ttf‎ ‎…elin-web/app/fonts/Simple-Line-Icons.ttf‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.ttf renamed to zeppelin-web/app/fonts/Simple-Line-Icons.ttf
diff --git a/‎…/app/assets/fonts/Simple-Line-Icons.woff‎ ‎…lin-web/app/fonts/Simple-Line-Icons.woff‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.woff renamed to zeppelin-web/app/fonts/Simple-Line-Icons.woff b/‎…/app/assets/fonts/Simple-Line-Icons.woff‎ ‎…lin-web/app/fonts/Simple-Line-Icons.woff‎zeppelin-web/app/assets/fonts/Simple-Line-Icons.woff renamed to zeppelin-web/app/fonts/Simple-Line-Icons.woff
diff --git a/‎…lin-web/app/assets/fonts/custom-font.eot‎ ‎zeppelin-web/app/fonts/custom-font.eot‎zeppelin-web/app/assets/fonts/custom-font.eot renamed to zeppelin-web/app/fonts/custom-font.eot b/‎…lin-web/app/assets/fonts/custom-font.eot‎ ‎zeppelin-web/app/fonts/custom-font.eot‎zeppelin-web/app/assets/fonts/custom-font.eot renamed to zeppelin-web/app/fonts/custom-font.eot
diff --git a/‎…lin-web/app/assets/fonts/custom-font.svg‎ ‎zeppelin-web/app/fonts/custom-font.svg‎zeppelin-web/app/assets/fonts/custom-font.svg renamed to zeppelin-web/app/fonts/custom-font.svg b/‎…lin-web/app/assets/fonts/custom-font.svg‎ ‎zeppelin-web/app/fonts/custom-font.svg‎zeppelin-web/app/assets/fonts/custom-font.svg renamed to zeppelin-web/app/fonts/custom-font.svg
@@ -63,7 +63,10 @@ module.exports = function (grunt) {
         tasks: ['wiredep']
       },
       js: {
-        files: ['<%= yeoman.app %>/{app, components}/**/*.js'],
+        files: [
+          '<%= yeoman.app %>/app/**/*.js',
+          '<%= yeoman.app %>/components/**/*.js'
+        ],
         tasks: ['newer:jshint:all'],
         options: {
           livereload: '<%= connect.options.livereload %>'
@@ -74,7 +77,11 @@ module.exports = function (grunt) {
         tasks: ['newer:jshint:test', 'karma']
       },
       styles: {
-        files: ['<%= yeoman.app %>/{app, components, assets/styles}/**/*.css'],
+        files: [
+          '<%= yeoman.app %>/app/**/*.css',
+          '<%= yeoman.app %>/components/**/*.css',
+          '<%= yeoman.app %>/assets/styles/**/*.css'
+        ],
         tasks: ['newer:copy:styles', 'autoprefixer']
       },
       gruntfile: {
@@ -85,7 +92,9 @@ module.exports = function (grunt) {
           livereload: '<%= connect.options.livereload %>'
         },
         files: [
-          '<%= yeoman.app %>/{app, components}/**/*.html',
+          '<%= yeoman.app %>/app/**/*.html',
+          '<%= yeoman.app %>/*.html',
+          '<%= yeoman.app %>/components/**/*.html',
           '.tmp/styles/{,*/}*.css',
           '<%= yeoman.app %>/assets/images/**/*.{png,jpg,jpeg,gif,webp,svg}'
         ]
@@ -297,18 +306,13 @@ module.exports = function (grunt) {
             'assets/styles/**/*',
             'assets/images/**/*',
             'WEB-INF/*',
+            'fonts/*'
           ]
         }, {
           expand : true,
           cwd: '<%= yeoman.app %>',
           dest: '<%= yeoman.dist %>',
           src: ['app/**/*.html', 'components/**/*.html']
-        }, {
-          expand : true,
-          flatten: true,
-          cwd: '<%= yeoman.app %>',
-          dest: '<%= yeoman.dist %>/fonts/',
-          src: ['assets/fonts/**/*']
         }, {
           expand: true,
           cwd: '.tmp/images',
 
@@ -11,6 +11,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+
 <div class="box width-full home">
   <div class="zeppelin">
     <div class="zeppelin2"></div>
 
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 'use strict';
 
 /**
@@ -23,6 +24,7 @@
  *
  * @author anthonycorbacho
  */
+
 angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $routeParams) {
   /** Current list of notes (ids) */
   $scope.notes = [];