Responsive tweaks and refactoring

This commit is contained in:
Colin McLeod
2015-06-10 00:17:08 -07:00
parent 3cdb576140
commit 4fb1ad11ca
16 changed files with 139 additions and 52 deletions

View File

@@ -19,7 +19,7 @@ angular.module('app').directive('areaChart', ['$window', function ($window) {
dragging = false,
// Define Axes
xAxis = d3.svg.axis().outerTickSize(0).orient("bottom").tickFormat(d3.format('.2r')),
yAxis = d3.svg.axis().outerTickSize(0).orient("left").tickFormat(fmt),
yAxis = d3.svg.axis().ticks(6).outerTickSize(0).orient("left").tickFormat(fmt),
x = d3.scale.linear(),
y = d3.scale.linear();
@@ -78,7 +78,7 @@ angular.module('app').directive('areaChart', ['$window', function ($window) {
function render() {
var width = element[0].parentElement.offsetWidth,
height = width * 0.6,
height = width * 0.5,
w = width - margin.left - margin.right,
h = height - margin.top - margin.bottom,
data = [];

View File

@@ -50,10 +50,10 @@ angular.module('app').directive('slider', ['$window', function ($window) {
.scale(x)
.orient("bottom")
.tickFormat(function(d) { return d + unit; })
.ticks(5)
.tickValues([0, scope.max / 4, scope.max / 2, (3 * scope.max) / 4, scope.max])
.tickSize(0)
.tickPadding(12))
.select(".domain");
.select(".domain");
lbl.attr('x', w + 20);
slider.call(brush.extent([val, val])).call(brush.event);
slider.selectAll(".extent,.resize").remove();