Skip to content

Commit ed8a673

Browse files
committed
Merge remote-tracking branch 'troolee/master'
2 parents fc571d8 + a4540dc commit ed8a673

24 files changed

+2403
-2470
lines changed

.gitignore

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

.jscsrc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"preset": "google",
3+
"validateIndentation": "\t",
4+
"maximumLineLength": 120,
5+
"jsDoc": {
6+
"checkAnnotations": {
7+
"preset": "jsdoc3",
8+
"extra": {
9+
"preserve": true
10+
}
11+
}
12+
},
13+
"requireCamelCaseOrUpperCaseIdentifiers": true
14+
}

Gruntfile.js

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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+
preserveComments: 'some'
43+
},
44+
dist: {
45+
files: {
46+
'dist/gridstack.min.js': ['src/gridstack.js']
47+
}
48+
}
49+
},
50+
51+
doctoc: {
52+
options: {
53+
removeAd: false
54+
},
55+
readme: {
56+
target: "./README.md"
57+
}
58+
}
59+
});
60+
61+
grunt.registerTask('default', ['sass', 'cssmin', 'copy', 'uglify', 'doctoc']);
62+
};

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)