Skip to content

Commit

Permalink
Merge pull request #1248 from palantir/release-v0.34.0
Browse files Browse the repository at this point in the history
Release v0.34.0 (--> master)
  • Loading branch information
jtlan committed Oct 25, 2014
2 parents 7e9b5f7 + f0fd5e1 commit e91a696
Show file tree
Hide file tree
Showing 87 changed files with 8,227 additions and 1,215 deletions.
13 changes: 10 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ module.exports = function(grunt) {
options: {
configuration: grunt.file.readJSON("tslint.json")
},
files: ["src/**/*.ts", "test/**/*.ts"]
all: {
src: ["src/**/*.ts", "test/**/*.ts"]
}
},
jshint: {
files: ['Gruntfile.js', 'quicktests/**/*.js'],
Expand All @@ -205,6 +207,11 @@ module.exports = function(grunt) {
"eqnull": true
}
},
parallelize: {
tslint: {
all: 4
}
},
watch: {
"options": {
livereload: true
Expand Down Expand Up @@ -338,7 +345,7 @@ module.exports = function(grunt) {
grunt.registerTask("dist-compile", [
"dev-compile",
"blanket_mocha",
"tslint",
"parallelize:tslint",
"ts:verify_d_ts",
"uglify",
"compress"
Expand All @@ -348,7 +355,7 @@ module.exports = function(grunt) {

grunt.registerTask("launch", ["connect", "dev-compile", "watch"]);
grunt.registerTask("test-sauce", ["connect", "saucelabs-mocha"]);
grunt.registerTask("test", ["dev-compile", "blanket_mocha", "tslint", "jshint", "ts:verify_d_ts"]);
grunt.registerTask("test", ["dev-compile", "blanket_mocha", "parallelize:tslint", "jshint", "ts:verify_d_ts"]);
// Disable saucelabs for external pull requests. Check if we can see the SAUCE_USERNAME
var travisTests = ["test"];
if (process.env.SAUCE_USERNAME) {
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable",
"description": "A library for creating charts out of D3",
"version": "0.33.1",
"version": "0.34.0",
"main": ["plottable.js", "plottable.css"],
"license": "MIT",
"ignore": [
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable.js",
"description": "A library for creating charts out of D3",
"version": "0.33.1",
"version": "0.34.0",
"repository": {
"type": "git",
"url": "https://github.com/palantir/plottable.git"
Expand Down Expand Up @@ -30,6 +30,7 @@
"grunt-contrib-compress": "~0.9.1",
"grunt-contrib-uglify": "~0.4.0",
"grunt-shell": "0.7.0",
"grunt-contrib-jshint": "^0.10.0"
"grunt-contrib-jshint": "^0.10.0",
"grunt-parallelize": "1.0.0"
}
}
3,609 changes: 3,609 additions & 0 deletions plottable-dev.d.ts

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions plottable.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ svg.plottable {
fill: #32313F;
}

.plottable .bar-label-text-area text {
font-family: "Helvetica Neue", sans-serif;
font-size: 14px;
}

.plottable .light-label text {
fill: white;
}

.plottable .dark-label text {
fill: #32313F;
}

.plottable .axis-label text {
font-size: 10px;
font-weight: bold;
Expand Down
Loading

0 comments on commit e91a696

Please sign in to comment.