Skip to content

C
c3-closed
Commit deba01c9 authored by mikhail samoilov's avatar mikhail samoilov
Browse files
Options

Merge branch 'master' into area

Conflicts: c3.js
parents c08d031c 05e80d19
Expand all Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 4 deletions
bower.json
View file @ deba01c9
{ {
"name": "c3", "name": "c3",
"main": "c3.min.js", "main": "c3.min.js",
"version": "0.1.3", "version": "0.1.6",
"homepage": "https://github.com/masayuki0812/c3", "homepage": "https://github.com/masayuki0812/c3",
"authors": [ "authors": [
"Masayuki Tanaka <masayuki0812@mac.com>" "Masayuki Tanaka <masayuki0812@mac.com>"
......
c3.css
View file @ deba01c9
...@@ -15,6 +15,15 @@ text { ...@@ -15,6 +15,15 @@ text {
user-select: none; user-select: none;
} }
.chart-arc path {
stroke: #fff;
}
.chart-arc text {
fill: #fff;
font-size: 13px;
}
/*-- Grid --*/ /*-- Grid --*/
.grid line { .grid line {
...@@ -60,7 +69,7 @@ text { ...@@ -60,7 +69,7 @@ text {
/*-- Focus --*/ /*-- Focus --*/
.target.focused path { .target.focused path.-line {
stroke-width: 2px; stroke-width: 2px;
} }
......
htdocs/index.html
View file @ deba01c9
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<h3>Load Data</h3> <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> <p><a class="btn btn-default" href="/samples/data_load.html" role="button">View details &raquo;</a></p>
</div> </div>
</div> </div>
...@@ -94,6 +94,11 @@ ...@@ -94,6 +94,11 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <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> <h3>Combination Chart</h3>
<p>Display as Bar Chart</p> <p>Display as Bar Chart</p>
<p><a class="btn btn-default" href="/samples/chart_combination.html" role="button">View details &raquo;</a></p> <p><a class="btn btn-default" href="/samples/chart_combination.html" role="button">View details &raquo;</a></p>
......
htdocs/samples/chart_area.html 0 → 100644
View file @ deba01c9
<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>
package.json
View file @ deba01c9
{ {
"name": "c3", "name": "c3",
"version": "0.1.3", "version": "0.1.6",
"description": "D3-based reusable chart library", "description": "D3-based reusable chart library",
"main": "c3.js", "main": "c3.js",
"scripts": { "scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment