Chart now spans top correctly

tmostak · Sep 15, 2013 · 8a498b5 · 8a498b5
1 parent 8daa38c
commit 8a498b5
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 9 deletions.
diff --git a/css/chart.css b/css/chart.css
@@ -62,12 +62,16 @@ rect.pane {
 
 .chart-settings {
   float: left;
-  //width: 150px;
-  margin-top:20px;
+  //position:absolute;
+  position:relative;
+  width: 400px;
+  height:100%;
+  //margin-top:0px;
 }
 
 .chart-compare { 
   position: relative;
+  margin-top:10px;
   font-size: 12px;
 }
 
@@ -133,3 +137,4 @@ rect.pane {
 }
 
 
+
diff --git a/css/map.css b/css/map.css
@@ -178,7 +178,7 @@ div#tweets {
 
 div#cloud {
   margin-top: 0px;
-  height: 22%;
+  height: 20%;
 }
 
 div#sortPref {

diff --git a/img/heatmap-button-bw.png b/img/heatmap-button-bw.png
diff --git a/img/heatmap-button-desat.png b/img/heatmap-button-desat.png
diff --git a/img/heatmap-button-full.png b/img/heatmap-button-full.png
diff --git a/img/point-button-bw.png b/img/point-button-bw.png
diff --git a/img/point-button-desat.png b/img/point-button-desat.png
diff --git a/img/point-button-full.png b/img/point-button-full.png
diff --git a/img/target.png b/img/target.png
diff --git a/img/twitter-bird.png b/img/twitter-bird.png
diff --git a/js/chart.js b/js/chart.js
@@ -52,10 +52,11 @@ var LineChart =
         .attr("class", "chart-details");
 
 
-    var margin = {top: 25, right: 30, bottom: 25, left: 420},
+    var margin = {top: 25, right: 30, bottom: 25, left: 425},
         //width = 400 - margin.left - margin.right,
-        width = 1980 - margin.left - margin.right,
-        height = 160 - margin.top - margin.bottom;
+         width = $(window).width() - margin.left - margin.right,
+        //height = 160 - margin.top - margin.bottom;
+         height = 200 - margin.top - margin.bottom;
 
     this.x = d3.time.scale().range([0, width]);
     this.y = d3.scale.linear().range([height, 0]);
@@ -79,10 +80,10 @@ var LineChart =
         .attr("class", "chart")
          .append("svg")
        //.attr("width", width + margin.left + margin.right)
-        .attr("width", width )
+        .attr("width", width + margin.right)
         .attr("height", height + margin.top + margin.bottom)
       .append("g")
-       .attr("transform", "translate(" + 50 + "," + margin.top + ")");
+       .attr("transform", "translate(" + 60 + "," + margin.top + ")");
        //.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
         //.attr("margin-left", margin.left);
     this.elems.svg = svg;
@@ -114,7 +115,8 @@ var LineChart =
 
     this.elems.info = this.elems.container.select("svg").append("g")
         .attr("class", "info")
-        .attr("transform", "translate(" + margin.left + "," + (margin.top - 5) + ")");
+        //.attr("transform", "translate(" + margin.left + "," + (margin.top - 5) + ")");
+        .attr("transform", "translate(" + 60 + "," + (margin.top - 5) + ")");
 
     this.elems.info.append("text")
         .attr("class", "date");