Skip to content

Commit 96b84ed

Browse files
committed
Merge commit 'acc2acbec1a2839656bd1a04a30ab8b219dc1df5'
2 parents ce9d978 + acc2acb commit 96b84ed

18 files changed

+2426
-433
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

Gruntfile.js

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
module.exports = function (grunt) {
2+
grunt.loadNpmTasks('grunt-sass');
3+
grunt.loadNpmTasks('grunt-contrib-cssmin');
4+
grunt.loadNpmTasks('grunt-contrib-copy');
5+
grunt.loadNpmTasks('grunt-contrib-uglify');
6+
grunt.loadNpmTasks('grunt-doctoc');
7+
8+
grunt.initConfig({
9+
sass: {
10+
options: {
11+
outputStyle: 'expanded'
12+
},
13+
dist: {
14+
files: {
15+
'dist/gridstack.css': 'src/gridstack.scss',
16+
'dist/gridstack-extra.css': 'src/gridstack-extra.scss'
17+
}
18+
}
19+
},
20+
21+
cssmin: {
22+
dist: {
23+
files: {
24+
'dist/gridstack.min.css': ['dist/gridstack.css'],
25+
'dist/gridstack-extra.min.css': ['dist/gridstack-extra.css']
26+
}
27+
}
28+
},
29+
30+
copy: {
31+
dist: {
32+
files: {
33+
'dist/gridstack.js': ['src/gridstack.js']
34+
}
35+
}
36+
},
37+
38+
uglify: {
39+
options: {
40+
sourceMap: true,
41+
sourceMapName: 'dist/gridstack.min.map'
42+
},
43+
dist: {
44+
files: {
45+
'dist/gridstack.min.js': ['src/gridstack.js']
46+
}
47+
}
48+
},
49+
50+
doctoc: {
51+
options: {
52+
removeAd: false
53+
},
54+
readme: {
55+
target: "./README.md"
56+
}
57+
}
58+
});
59+
60+
grunt.registerTask('default', ['sass', 'cssmin', 'copy', 'uglify', 'doctoc']);
61+
};

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2015 Pavel Reznikov
3+
Copyright (c) 2014-2016 Pavel Reznikov
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)