Merge branch 'master' into area

Conflicts: c3.js

Merge branch 'master' into area
deba01c9 · mikhail samoilov · c08d031c · 05e80d19 · deba01c9 · deba01c9
Commit deba01c9 authored Feb 09, 2014 by mikhail samoilov
7 changed files
--- a/bower.json
+++ b/bower.json
 {
  "name": "c3",
  "main": "c3.min.js",
-  "version": "0.1.3",
+  "version": "0.1.6",
  "homepage": "https://github.com/masayuki0812/c3",
  "authors": [
    "Masayuki Tanaka <masayuki0812@mac.com>"

--- a/c3.css
+++ b/c3.css
@@ -15,6 +15,15 @@ text {
          user-select: none;
 }

+.chart-arc path {
+  stroke: #fff;
+
+}
+.chart-arc text {
+  fill: #fff;
+  font-size: 13px;
+}
+
 /*-- Grid --*/

 .grid line {
@@ -60,7 +69,7 @@ text {

 /*-- Focus --*/

-.target.focused path {
+.target.focused path.-line {
  stroke-width: 2px;
 }


--- a/c3.js
+++ b/c3.js
--- a/c3.min.js
+++ b/c3.min.js
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -66,7 +66,7 @@
          <div class="row">
            <div class="col-md-4">
              <h3>Load Data</h3>
-              <p>Load data dinamically.</p>
+              <p>Load data dynamically.</p>
              <p><a class="btn btn-default" href="/samples/data_load.html" role="button">View details &raquo;</a></p>
            </div>
          </div>
@@ -94,6 +94,11 @@
          </div>
          <div class="row">
            <div class="col-md-4">
+              <h3>Area Chart</h3>
+              <p>Display as Filled Area Chart</p>
+              <p><a class="btn btn-default" href="/samples/chart_area.html" role="button">View details &raquo;</a></p>
+            </div>
+            <div class="col-md-4">
              <h3>Combination Chart</h3>
              <p>Display as Bar Chart</p>
              <p><a class="btn btn-default" href="/samples/chart_combination.html" role="button">View details &raquo;</a></p>

--- a/htdocs/samples/chart_area.html
+++ b/htdocs/samples/chart_area.html
+<html>
+  <head>
+    <link href="/css/c3.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <div id="chart"></div>
+
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="/js/c3.js"></script>
+    <script>
+      var chart = c3.generate({
+        data: {
+          columns: [
+            ['data1', 300, 350, 300, 0, 0, 0],
+            ['data2', 130, 100, 140, 200, 150, 50]
+          ],
+          types: {
+            data1: 'area',
+            data2: 'area-spline'
+          }
+        }
+      });
+    </script>
+  </body>
+</html>
--- a/package.json
+++ b/package.json
 {
  "name": "c3",
-  "version": "0.1.3",
+  "version": "0.1.6",
  "description": "D3-based reusable chart library",
  "main": "c3.js",
  "scripts": {