scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								2253dc61bd
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	.DS_Store
#	css/styles.css 
							
						 | 
						
							2016-02-10 08:47:25 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								a4293a0fc5
								
							
						 | 
						
							
							
								
								search/dropdown css tweaks
							
							
							
							
							
						 | 
						
							2016-02-10 08:46:28 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								c9ebf42207
								
							
						 | 
						
							
							
								
								Nav/IA scaffolding
							
							
							
							
							
						 | 
						
							2016-02-09 19:52:22 -08:00 | 
						
					
				
					
						
							
							
								 
								Creatures in Unitards
							
						 | 
						
							
							
							
							
							
								
							
							
								f87848f38b
								
							
						 | 
						
							
							
								
								overflow fix
							
							
							
							
							
						 | 
						
							2016-02-09 16:24:17 -08:00 | 
						
					
				
					
						
							
							
								 
								Creatures in Unitards
							
						 | 
						
							
							
							
							
							
								
							
							
								ee26a7535a
								
							
						 | 
						
							
							
								
								fix?
							
							
							
							
							
						 | 
						
							2016-02-09 16:17:21 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								517e5dcb90
								
							
						 | 
						
							
							
								
								TOC Logic - bug?
							
							
							
							
							
						 | 
						
							2016-02-09 14:41:21 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								e3f9555ae2
								
							
						 | 
						
							
							
								
								TOC logic
							
							
							
							
							
						 | 
						
							2016-02-09 14:00:06 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								e44588b93f
								
							
						 | 
						
							
							
								
								TOC functionality
							
							
							
							
							
						 | 
						
							2016-02-09 13:58:34 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								893c323dc0
								
							
						 | 
						
							
							
								
								searchbar
							
							
							
							
							
						 | 
						
							2016-02-09 13:34:59 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								435a4a534a
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/CreaturesInUnitards/CreaturesInUnitards.github.io
							
							
							
							
							
						 | 
						
							2016-02-09 13:23:37 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								a53cd45d08
								
							
						 | 
						
							
							
								
								toc logic
							
							
							
							
							
						 | 
						
							2016-02-09 13:23:33 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								33df5f8eb4
								
							
						 | 
						
							
							
								
								another css fix
							
							
							
							
							
						 | 
						
							2016-02-09 12:21:38 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								465e0329a4
								
							
						 | 
						
							
							
								
								added version dropdown
							
							
							
							
							
						 | 
						
							2016-02-09 12:18:19 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								7b55b0b243
								
							
						 | 
						
							
							
								
								Example TOC include file use
							
							
							
							
							
						 | 
						
							2016-02-09 12:09:21 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								899b26e42f
								
							
						 | 
						
							
							
								
								TOC logic add
							
							
							
							
							
						 | 
						
							2016-02-09 12:04:57 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								6d10939575
								
							
						 | 
						
							
							
								
								adding TOC logic
							
							
							
							
							
						 | 
						
							2016-02-09 11:56:38 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								445c52930c
								
							
						 | 
						
							
							
								
								css image path fix
							
							
							
							
							
						 | 
						
							2016-02-09 09:34:37 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								d95e608636
								
							
						 | 
						
							
							
								
								first pass at TOC
							
							
							
							
							
						 | 
						
							2016-02-09 09:29:27 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								a4f120615d
								
							
						 | 
						
							
							
								
								Demo scope for versions
							
							
							
							
							
						 | 
						
							2016-02-08 18:53:05 -08:00 | 
						
					
				
					
						
							
							
								 
								John Mulhausen
							
						 | 
						
							
							
							
							
							
								
							
							
								e52be7c82e
								
							
						 | 
						
							
							
								
								First pass at layout creation
							
							
							
							
							
						 | 
						
							2016-02-08 18:28:54 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								c1f24e5e60
								
							
						 | 
						
							
							
								
								preliminary scaffolding
							
							
							
							
							
						 | 
						
							2016-02-08 17:20:55 -08:00 | 
						
					
				
					
						
							
							
								 
								scotty
							
						 | 
						
							
							
							
							
							
								
							
							
								8c2247bf61
								
							
						 | 
						
							
							
								
								initial commit
							
							
							
							
							
						 | 
						
							2016-02-04 13:41:09 -08:00 | 
						
					
				
					
						
							
							
								 
								Creatures in Unitards
							
						 | 
						
							
							
							
							
							
								
							
							
								8386d0d991
								
							
						 | 
						
							
							
								
								Initial commit
							
							
							
							
							
						 | 
						
							2016-02-04 13:34:16 -08:00 |