Skip to content

Commit 9f69ea7

Browse files
committed
Merge pull request jsonwebtoken#73 from jsonwebtoken/new-redesign-beneliflo
Branch redesign
2 parents c519685 + 8edd945 commit 9f69ea7

Some content is hidden

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

74 files changed

+10520
-2091
lines changed

Gruntfile.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (grunt) {
1010
options: {
1111
livereload: true
1212
},
13-
files: ['Gruntfile.js', 'js/**/*.js', 'less/**/*.less', 'html/index.html'],
13+
files: ['Gruntfile.js', 'js/**/*.js', 'stylus/**/*.styl', 'html/**/*.jade', 'html/index.html'],
1414
tasks: ['build']
1515
}
1616
},
@@ -24,13 +24,17 @@ module.exports = function (grunt) {
2424
}
2525
},
2626
},
27-
less: {
28-
production: {
29-
options: {
30-
cleancss: true
31-
},
27+
stylus: {
28+
compile: {
29+
files: {
30+
'css/app.css': 'stylus/app.styl'
31+
}
32+
}
33+
},
34+
jade: {
35+
compile: {
3236
files: {
33-
'css/app.css': 'less/app.less'
37+
'new.html': 'html/new.jade'
3438
}
3539
}
3640
},
@@ -57,7 +61,7 @@ module.exports = function (grunt) {
5761
}
5862
});
5963

60-
grunt.registerTask('build', ['clean', 'less', 'useminPrepare', 'concat', 'uglify', 'cssmin', 'htmlmin', 'usemin']);
64+
grunt.registerTask('build', ['clean', 'stylus', 'useminPrepare', 'concat', 'uglify', 'cssmin', 'htmlmin', 'usemin']);
6165
grunt.registerTask('test', ['build', 'mocha_phantomjs']);
62-
grunt.registerTask('default', ['build', 'connect', 'watch']);
66+
grunt.registerTask('default', ['build', 'jade', 'connect', 'watch']);
6367
};

dist/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/app.js

Lines changed: 15 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/index.html

Lines changed: 587 additions & 825 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)