Permalink
Browse files

Merge branch 'master' into sorting-data

  • Loading branch information...
2 parents 2474f29 + e861955 commit 15ba34e2c990da720fec46f73f63e09d8ac82196 @paularmstrong paularmstrong committed Jun 28, 2013
Showing with 10 additions and 9 deletions.
  1. +1 −1 Makefile
  2. +1 −0 docs/js/d3.min.js
  3. +0 −1 docs/js/d3.v2.min.js
  4. +1 −1 docs/layouts/master.html
  5. +1 −1 docs/less/charts.less
  6. +1 −1 lib/xcharts.less
  7. +4 −3 package.json
  8. +1 −1 test/test.html
View
@@ -87,7 +87,7 @@ lint:
reporter='dot'
test: build
- @node_modules/.bin/mocha-phantomjs test/test.html --reporter ${reporter}
+ @${NODE_PATH}/mocha-phantomjs test/test.html --reporter ${reporter}
pre-docs: clean build
@sed -i.bak 's/v[0-9]*\.[0-9]*\.[0-9]*/v${VERSION}/' docs.json
View
View
View
@@ -21,7 +21,7 @@
{% block head_js %}
-<script src="{{ baseurl }}/js/d3.v2.min.js"></script>
+<script src="{{ baseurl }}/js/d3.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script src="{{ baseurl }}/js/xcharts.min.js"></script>
<script src="{{ baseurl }}/js/rainbow.min.js"></script>
View
@@ -78,7 +78,7 @@ circle {
.domain {
fill: none;
}
- .tick {
+ .tick line {
stroke: @colorFlyweight;
stroke-width: 1px;
}
View
@@ -15,7 +15,7 @@
.domain {
fill: none;
}
- .tick {
+ .tick line {
stroke: #EEE;
stroke-width: 1px;
}
View
@@ -33,11 +33,12 @@
"less": "~1.3.1",
"uglify-js": "~2.2.2",
"nodelint": "~0.6",
- "mocha": "~1.6",
+ "mocha": "~1.9",
"expect.js": "~0.1",
- "d3": "~2.10.1",
+ "d3": "~3.2",
"still": "*",
"swig": "*",
- "mocha-phantomjs": "~1.0"
+ "mocha-phantomjs": "~3.0",
+ "phantomjs": "~1.9.1-0"
}
}
View
@@ -23,7 +23,7 @@
mocha.ignoreLeaks();
</script>
- <script src="../node_modules/d3/d3.v2.min.js"></script>
+ <script src="../node_modules/d3/d3.min.js"></script>
<script src="../build/xcharts.js"></script>
<script src="chart.test.js"></script>
<script src="scales.test.js"></script>

0 comments on commit 15ba34e

Please sign in to comment.