Skip to content

Commit 9d8af44

Browse files
committed
first chapter
1 parent c909aaa commit 9d8af44

566 files changed

Lines changed: 135589 additions & 64316 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gruntfile.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ module.exports = function(grunt) {
99
require('time-grunt')(grunt);
1010
require('load-grunt-tasks')(grunt, {
1111
pattern: [
12-
'grunt-*',
13-
'assemble*'
12+
'grunt-*'
1413
]
1514
});
1615

@@ -51,32 +50,34 @@ module.exports = function(grunt) {
5150
/**
5251
* Build HTML from templates and data
5352
*/
54-
assemble: getTask('assemble'),
53+
// assemble: getTask('assemble'),
5554

5655
htmlmin: getTask('htmlmin'),
5756

58-
modernizr: getTask('modernizr'),
57+
// modernizr: getTask('modernizr'),
5958

6059
watch: getTask('watch'),
6160

62-
connect: getTask('connect')
61+
connect: getTask('connect'),
62+
63+
browserSync:getTask('browserSync')
6364

6465
});
6566

6667

6768
// JS distribution task.
68-
grunt.registerTask('dist-js', ['modernizr', 'jshint', 'concat', 'uglify']);
69+
grunt.registerTask('dist-js', ['jshint', 'concat', 'uglify']);
6970

7071

7172
// Full distribution task.
7273
grunt.registerTask('dist', ['clean', 'copy', 'less', 'dist-js', 'usebanner']);
7374

74-
grunt.registerTask('serve', ['connect:livereload', 'watch']);
75+
grunt.registerTask('serve', ['browserSync', 'watch']);
7576

7677

7778
// Default task.
7879
//grunt.registerTask('default', ['test', 'dist']);
7980

80-
grunt.registerTask('default', ['dist', 'assemble']);
81+
grunt.registerTask('default', ['dist']);
8182

8283
};

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# BUILD CONFIG
33
# =============================================
44

5-
dest: dist
5+
dest: public
66
assets: dist/assets
77

88
src: src

assemblefile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ app.task('init', function(cb) {
1414
app.helper('is', compare);
1515
app.helper('markdown', require('helper-markdown'));
1616
app.data('pkg', pkg);
17+
app.data('dist','dist');
1718
app.data(['./src/templates/data/**/*.{json,yml}']);
1819
// app.data('analytic','UA-23581568-13');
1920
app.layouts(path.join(__dirname, './src/templates/layouts/*.hbs'));

bower.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,12 @@
4141
"jQuery.validVal": "~5.0.2",
4242
"jquery.gritter": "~1.7.4",
4343
"plupload": "~2.1.2",
44-
"bootstrap-switch": "~3.3.6",
44+
"bootstrap-switch": "~3.3.2",
4545
"kbwood_countdown": "git://github.com/kbwood/countdown.git#2.0.1",
4646
"jquery-inputlimiter": "https://jquery-inputlimiter.googlecode.com/files/jquery-inputlimiter.1.3.1.zip",
4747
"bootstrap-duallistbox": "~3.0.2",
4848
"fullcalendar": "~2.2.6",
4949
"bootstrap3-wysihtml5-bower": "~0.3.3",
50-
"bootstrap": "~3.3.6",
5150
"jquery-validation": "~1.13.1"
52-
},
53-
"resolutions": {
54-
"jquery": "~2.1.3",
55-
"bootstrap": "~3.3.6"
5651
}
5752
}

dist/403.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

dist/404.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

dist/405.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

dist/500.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

dist/503.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)