Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
philkrie committed Oct 25, 2015
2 parents 518c494 + 2a7196f commit c80ba66
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions flask/static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ footer {
background: url(http://www.pixeden.com/media/k2/galleries/112/003-subtle-light-pattern-background-texture.jpg);
margin: 40px 0px;
}

#bad{
text-align: center;
padding-bottom: 25px;
}

h3{
text-align: center;
}
Expand Down
7 changes: 3 additions & 4 deletions flask/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ <h1>Twitter Topic Topography</h1>
<div class="panel">
<h3>Location Samples</h3>
<div class = "row" id='topFive'></div>

</div>
<footer>
<div class="container">
Expand Down Expand Up @@ -259,23 +258,23 @@ <h4 class="text-center">Holla</h4>
sad_heatmap = new google.maps.visualization.HeatmapLayer({
data: sad_array,
map: map,
radius:70,
radius: 80,
gradient: sad_gradient,
opacity: .5
});

happy_heatmap = new google.maps.visualization.HeatmapLayer({
data: happy_array,
map: map,
radius: 70,
radius: 80,
gradient: happy_gradient,
opacity: .5
});

neutral_heatmap = new google.maps.visualization.HeatmapLayer({
data: neutral_array,
map: map,
radius: 70,
radius: 80,
gradient: neutral_gradient,
opacity: .5
});
Expand Down

0 comments on commit c80ba66

Please sign in to comment.