Skip to content

Commit c6a71a0

Browse files
committed
1.5.0 release
1 parent a268696 commit c6a71a0

Some content is hidden

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

63 files changed

+7515
-11412
lines changed

Gruntfile.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11

22
module.exports = function(grunt) {
33

4-
var config = require('./config');
4+
var config;
5+
try {
6+
config = require('./config');
7+
} catch(ex) {
8+
config = {};
9+
grunt.log.writeln('WARNING: config.js does not exist');
10+
}
11+
config.staticDir = config.staticDir || 'public/static';
512

613
grunt.initConfig({
714
pkg: grunt.file.readJSON('package.json'),
@@ -471,7 +478,7 @@ module.exports = function(grunt) {
471478
]);
472479

473480
grunt.registerTask('restore', [
474-
'clean:pub_static',
481+
//'clean:pub_static',
475482
'copy:release_to_pub',
476483
'clean:examples_static',
477484
'copy:release_to_examples',
@@ -487,7 +494,7 @@ module.exports = function(grunt) {
487494
]);
488495

489496
grunt.registerTask('deploy', [
490-
'clean:pub_static',
497+
//'clean:pub_static',
491498
'copy:dist_to_pub'
492499
]);
493500

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,31 @@ or build your own:
4545

4646
1. node, npm
4747
2. [grunt v0.4](http://gruntjs.com/getting-started) - `npm install grunt-cli -g`
48-
3. [bower v1.0.0](http://bower.io/) - `npm install bower -g`
48+
3. [bower](http://bower.io/) - `npm install bower -g`
4949
4. ruby, gem, [bundler](http://gembundler.com/)
5050

5151
### Install dependencies
5252

5353
1. `npm install`
5454
2. `bundle install`
5555
3. `bower install`
56+
4. `grunt update`
5657

57-
### Build and use in your mobile project
58+
### The first build
5859

5960
1. `cp config.js.tmpl config.js`
6061
2. Resolve TODO in config.js
61-
3. `grunt`
62+
3. `grunt publish`
6263

63-
## Dev Guild
64+
### Development
6465

6566
1. `grunt watch`
66-
2. Edit source files in `js/`, `css/` and `tpl/`
67+
2. Edit source files in `js`, `css` and `tpl`
68+
69+
### Before committing
70+
71+
* `grunt` - small commits
72+
* `grunt publish` - version change (rebuild the distribution files)
6773

6874
## Docs & Demos
6975

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "cardkit",
33
"description": "",
4-
"version": "1.4.3",
4+
"version": "1.5.0",
55
"dependencies": {
66
},
77
"devDependencies": {

dist/css/cardkit.css

Lines changed: 2035 additions & 0 deletions
Large diffs are not rendered by default.

dist/css/cardkit.min.css

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

0 commit comments

Comments
 (0)