Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nko3/coordinated-hackers
Browse files Browse the repository at this point in the history
Conflicts:
	static/css/style.css
  • Loading branch information
dmvaldman committed Nov 11, 2012
2 parents b6ea025 + 072b08b commit 1bfd794
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ body {
#gifContainer img{
margin-top: 10px;
border: 1px solid black;

-webkit-transform: rotate3d(0, 1, 0, 180deg);
-moz-transform: rotate3d(0, 1, 0, 180deg);
-o-transform: rotate3d(0, 1, 0, 180deg);
transform: rotate3d(0, 1, 0, 180deg);

}

.hero-unit{
Expand Down Expand Up @@ -160,4 +162,4 @@ h7{

.modal-body .btn{
margin-top:10px;
}
}
9 changes: 7 additions & 2 deletions static/js/gif.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@ var gif = (function(){
var binary_gif = animation_parts.join('');
var data_url = 'data:image/gif;base64,'+window.btoa(binary_gif);

var gifItem = new Image();
gifItem.src = data_url;
var gifImage = new Image();
gifImage.src = data_url;
var gifItem = document.createElement("a");
gifItem.setAttribute("href", data_url);
gifItem.setAttribute("target", "_blank");
gifItem.appendChild(gifImage);

document.getElementById("gifContainer").appendChild(gifItem);
canvasDataArray = [];
animation_parts = [];
Expand Down

0 comments on commit 1bfd794

Please sign in to comment.