Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/husmith/hacktown
Browse files Browse the repository at this point in the history
  • Loading branch information
husmith committed Oct 25, 2015
2 parents 5471350 + 57b2ff0 commit 34b3825
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions flask/static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ p{
}
h2{
margin: 10px;
word-wrap: break-word;

}

td{
Expand Down
10 changes: 5 additions & 5 deletions flask/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ <h5 class="text-center">Cody Hatfield, Phillip Kriegel, Hannah Smith, Molly Stee
$("#topFive").append("<p>I'm famous, screw off</p>");
}else{
$("#topFive").append("<div id='bad' class='col-md-1'></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><strong>" + json.result[0] + "</strong></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><strong>" + json.result[1] + "</strong></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><strong>" + json.result[2] + "</strong></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><strong>" + json.result[3] + "</strong><strong></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><strong>" + json.result[4] + "</strong></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><h2><strong>" + json.result[0] + "</strong></h2></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><h2><strong>" + json.result[1] + "</strong></h2></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><h2><strong>" + json.result[2] + "</strong></h2></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><h2><strong>" + json.result[3] + "</strong><strong></h2></div>");
$("#topFive").append("<div id='bad' class='col-md-2'><h2><strong>" + json.result[4] + "</strong></h2></div>");
$("#topFive").append("<div id='bad' class='col-md-1'></div>");
}
}
Expand Down

0 comments on commit 34b3825

Please sign in to comment.