Fix Grunt watch

This commit is contained in:
Damien Corneau 2015-04-29 12:06:43 +09:00
parent 15b502ca42
commit 0ee04a2a33
17 changed files with 24 additions and 15 deletions

View file

@ -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',

View file

@ -11,6 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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>

View file

@ -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 = [];

View file

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 175 KiB

View file

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

View file

@ -62,15 +62,17 @@ limitations under the License.
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#/"><img style="margin-top: -7px;s" src="assets/images/zepLogoW.png" width="50" alt="I'm zeppelin"> Zeppelin</a>
<a class="navbar-brand" href="#/">
<img style="margin-top: -7px;s" src="assets/images/zepLogoW.png" width="50" alt="I'm zeppelin">Zeppelin
</a>
</div>
<div class="collapse navbar-collapse" ng-controller="NavCtrl">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
<a href="#" class="dropdown-toggle">Notebook<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="javascript:void(0);" ng-click="createNewNote()"><i class="fa fa-plus"></i> Create new note</a></li>
<li><a href="javascript:void(0);" ng-click="createNewNote()"><i class="fa fa-plus"></i>Create new note</a></li>
<li class="divider"></li>
<div id="notebook-list" class="scrollbar-container">
<li ng-repeat="note in notes track by $index" ng-class="{'active' : isActive(note.id)}">
@ -149,9 +151,9 @@ limitations under the License.
<script src="components/navbar/navbar.controller.js"></script>
<script src="components/directives/ngdelete.js"></script>
<script src="components/directives/popover-html-unsafe.js"></script>
<script src="components/scripts/directives/ngenter.js"></script>
<script src="components/scripts/directives/dropdowninput.js"></script>
<script src="components/scripts/directives/resizable.js"></script>
<script src="components/directives/ngenter.js"></script>
<script src="components/directives/dropdowninput.js"></script>
<script src="components/directives/resizable.js"></script>
<!-- endbuild -->
</body>
</html>