fill under graph
font and switch circle sizes
diff --git a/web/ons-demo/css/skin.default.css b/web/ons-demo/css/skin.default.css
index 9f1ecf1..f473124 100644
--- a/web/ons-demo/css/skin.default.css
+++ b/web/ons-demo/css/skin.default.css
@@ -167,7 +167,7 @@
path.flow {
fill: none;
- stroke-width: 5px;
+ stroke-width: 8px;
stroke: rgba(255, 255, 255, .35);
}
@@ -181,13 +181,13 @@
}
path.iperfdata {
- fill: none;
+ fill: #ccc;
stroke-width: 1px;
stroke: #ccc;
}
.iperf {
- background-color: #222;
+ background-color: black;
}
#selectedFlowsHeader .iperf {
@@ -293,7 +293,7 @@
text {
stroke: none;
fill: white;
- font-size: 16px;
+ font-size: 22px;
pointer-events: none;
}
@@ -469,7 +469,7 @@
}
.flowCount {
- font-size: 20px;
+ font-size: 24px;
fill: rgba(255, 255, 255, .75);
}
diff --git a/web/ons-demo/js/app.js b/web/ons-demo/js/app.js
index f7ff533..94c41e2 100644
--- a/web/ons-demo/js/app.js
+++ b/web/ons-demo/js/app.js
@@ -41,7 +41,6 @@
// also works in Chrome v27
function zoomWorkaround() {
var zoom = window.document.body.clientWidth/window.document.width;
- console.log(zoom);
// workaround does not seem to be effective for transforming mouse coordinates
// map display does not use the transform stuff, so commenting out
// d3.select('#svg-container').style('zoom', zoom);
diff --git a/web/ons-demo/js/constants.js b/web/ons-demo/js/constants.js
index 0ef0882..51b3aa6 100644
--- a/web/ons-demo/js/constants.js
+++ b/web/ons-demo/js/constants.js
@@ -25,6 +25,6 @@
***************************************************************************************************/
var widths = {
edge: 6,
- aggregation: 12,
- core: 18
+ aggregation: 16,
+ core: 20
}
\ No newline at end of file
diff --git a/web/ons-demo/js/flows.js b/web/ons-demo/js/flows.js
index bc30d11..2834991 100644
--- a/web/ons-demo/js/flows.js
+++ b/web/ons-demo/js/flows.js
@@ -207,7 +207,7 @@
var pointsToDisplay = 1000;
function makePoints() {
- var pts = [];
+ var pts = [{x:0, y:30}];
var i;
for (i=0; i < pointsToDisplay; ++i) {
var sample = flow.iperfData.samples[i];
@@ -215,10 +215,11 @@
if (height > 28)
height = 28;
pts.push({
- x: i * 1000/(pointsToDisplay-1),
+ x: i * pointsToDisplay/(pointsToDisplay-1),
y: 30 - height
})
}
+ pts.push({x:pointsToDisplay, y:30});
return pts;
}