Merge branch 'main' of https://github.com/olinpin/twitter-project into Filters
This commit is contained in:
		| @@ -110,7 +110,8 @@ | ||||
|                         <!-- <div class="button">BLOCKED WORDS</div> --> | ||||
|                     </div> | ||||
|                     <div class="popchart column"> | ||||
|                         <span class="colheader chartheader">Sports Popularity Chart</span> | ||||
|                         <span class="colheader chartheader">Sports Popularity Filter</span> | ||||
|                         <div id="balk" style="height:300px; background-color: white;"></div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
| @@ -118,6 +119,7 @@ | ||||
|     </div> | ||||
|     <script src="/lib/jquery-2.1.1.min.js"></script> | ||||
|     <script src="/lib/jquery.flot.min.js"></script> | ||||
|     <script src="/lib/jquery.flot.categories.min.js"></script> | ||||
|     <script src="/lib/core.js"></script> | ||||
|     <script src="/lib/charts.js"></script> | ||||
|     <script src="/lib/log.js"></script> | ||||
| @@ -128,6 +130,8 @@ | ||||
|         block("#tweet").tweets({ | ||||
|             memory: 20 | ||||
|         }); | ||||
|         block('#balk').barchart(); | ||||
|         events.connect('balk', '#balk'); | ||||
|         events.connect("tweet", "#tweet"); | ||||
|  | ||||
|         // // create a rolling chart block | ||||
|   | ||||
| @@ -133,6 +133,13 @@ body { | ||||
| 	font-weight: bold; | ||||
| } | ||||
|  | ||||
| .tweet-nickname:hover { | ||||
| 	color: white; | ||||
| 	text-decoration: underline; | ||||
| 	font-weight: bold; | ||||
| } | ||||
|  | ||||
|  | ||||
| .tweet-username { | ||||
| 	color: var(--main-light); | ||||
| 	text-decoration: none; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tim Wijma
					Tim Wijma