Merge branch 'bitches' of https://github.com/olinpin/twitter-project into FiltersCSS
This commit is contained in:
		| @@ -62,7 +62,7 @@ | ||||
|             <div class="maintable"> | ||||
|                 <div class="leftcol column"> | ||||
|                     <span class="colheader">Latest Cluccs</span> | ||||
|                     <div class="tweetcontainer"> | ||||
|                     <div class="tweetcontainer" id="tweet"> | ||||
|                         <div class="tweet"> | ||||
|                             <img src="https://pbs.twimg.com/profile_images/1158803404656959490/9MKSbW4O_400x400.jpg" alt="" class="tweet-profilepicture"> | ||||
|                             <div class="tweet-content"> | ||||
| @@ -125,10 +125,10 @@ | ||||
|     <script src="./js/code.js"></script> | ||||
|     <script src="./js/connection.js"></script> | ||||
|     <script> | ||||
|         // block("#tweet").tweets({ | ||||
|         //     memory: 20 | ||||
|         // }); | ||||
|         // events.connect("tweet", "#tweet"); | ||||
|         block("#tweet").tweets({ | ||||
|             memory: 20 | ||||
|         }); | ||||
|         events.connect("tweet", "#tweet"); | ||||
|  | ||||
|         // // create a rolling chart block | ||||
|         // block('#graph').rolling_chart({ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tim Wijma
					Tim Wijma