Skip to content

Commit 21e21c6

Browse files
author
Eleni Rundle
committed
Merge pull request #33 from dtaylor113/addDonutChart
Donut Chart directive, styles, ng-docs, and unit test
2 parents 0c3bd53 + b8c87af commit 21e21c6

13 files changed

+956
-7
lines changed

.jshintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"globals": {
2222
"angular": false,
2323
"c3": false,
24-
"d3": false
25-
//"$": false
24+
"d3": false,
25+
"$": false
2626
}
2727
}

Gruntfile.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,23 @@ module.exports = function(grunt) {
6060
src: ['components/font-awesome/**'],
6161
dest: 'dist/docs',
6262
expand: true
63+
},
64+
styles: {
65+
cwd: 'styles/',
66+
src: ['*.css', '!*.min.css'],
67+
dest: 'dist/styles',
68+
expand: true
69+
}
70+
},
71+
cssmin: {
72+
target: {
73+
files: [{
74+
expand: true,
75+
cwd: 'styles',
76+
src: ['*.css', '!*.min.css'],
77+
dest: 'dist/styles',
78+
ext: '.min.css'
79+
}]
6380
}
6481
},
6582
htmlhint: {
@@ -108,7 +125,8 @@ module.exports = function(grunt) {
108125
'dist/angular-patternfly.js',
109126
'lib/patternfly/dist/js/patternfly.js'],
110127
html5Mode: false,
111-
styles: ['lib/patternfly/dist/css/patternfly.css', 'lib/patternfly/dist/css/patternfly-additions.css', 'misc/bootstrap-overrides.css']
128+
styles: ['lib/patternfly/dist/css/patternfly.css', 'lib/patternfly/dist/css/patternfly-additions.css',
129+
'misc/bootstrap-overrides.css', 'dist/styles/angular-patternfly.css']
112130
},
113131
all: ['src/**/*.js']
114132
},
@@ -186,7 +204,7 @@ module.exports = function(grunt) {
186204
concatSrc = 'src/**/*.js';
187205
}
188206

189-
grunt.task.run(['clean', 'jshint:beforeconcat', 'lint', 'test', 'ngtemplates', 'concat', 'uglify:build', 'ngdocs', 'copy', 'clean:templates']);
207+
grunt.task.run(['clean', 'jshint:beforeconcat', 'lint', 'test', 'ngtemplates', 'concat', 'uglify:build', 'cssmin', 'copy', 'ngdocs', 'clean:templates']);
190208
});
191209

192210
grunt.registerTask('default', ['build']);

bower.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"README.md",
2424
"bower.json"
2525
],
26-
"main": "dist/angular-patternfly.js",
26+
"main": [
27+
"dist/angular-patternfly.js",
28+
"dist/angular-patternfly.css"
29+
],
2730
"repository": {
2831
"type": "git",
2932
"url": "git://github.com/patternfly/angular-patternfly.git"

0 commit comments

Comments
 (0)