Merge branch 'master' of github.com:typecode/splash

thezekiel · thezekiel · commit da163bc22943 · 2010-12-01T13:09:30.000-05:00
diff --git a/css/tc.splash.css b/css/tc.splash.css
@@ -74,10 +74,12 @@ h1 span { display:none; }
 .content{
 	width: 680px;
 	margin:0px auto;
-	padding: 350px 0 50px 10px;
+	padding: 350px 0 50px 0px;
 	display:block;
 	position:relative;
 	z-index:100;
+	
+	opacity:0;
 }
 
 .content p {
diff --git a/index.html b/index.html
@@ -20,18 +20,18 @@ <h1><span>Type/Code</span></h1>
 		</div>
 		
 		<div class="content">
-			<p>We are <em>Type/Code</em>. We design things and make them come to life. We just opened our doors, so a full website is still in the oven.</p>
+			<p>We are <em>Type/Code</em>. We design things and make them come to life.<br/> We just opened our doors, so a full website is still in the oven.</p>
 			<p>Drop us a line: <a href="mailto:hello@typeslashcode.com">hello@typeslashcode.com</a></p>
 			<p>See what we’re up to on <a href="http://blog.typeslashcode.com">our blog</a></p>
 		</div>
 		
 		<script type="text/javascript" src="http://yui.yahooapis.com/combo?3.2.0/build/yui/yui-min.js&3.2.0/build/json/json-min.js&3.2.0/build/oop/oop-min.js&3.2.0/build/event-custom/event-custom-min.js&3.2.0/build/event/event-base-min.js&3.2.0/build/dom/dom-min.js&3.2.0/build/dom/dom-style-ie-min.js&3.2.0/build/pluginhost/pluginhost-min.js&3.2.0/build/node/node-min.js&3.2.0/build/event/event-delegate-min.js&3.2.0/build/querystring/querystring-stringify-simple-min.js&3.2.0/build/queue-promote/queue-promote-min.js&3.2.0/build/datatype/datatype-xml-min.js&3.2.0/build/io/io-min.js&3.2.0/build/event-simulate/event-simulate-min.js&3.2.0/build/node/node-event-simulate-min.js"></script>
 		<script type="text/javascript" src="scripts/lib/excanvas.compiled.js"></script>
 		<script type="text/javascript" src="scripts/lib/includes.sylvester.src.js"></script>
-    
+		
 		<script type="text/javascript" src="http://use.typekit.com/kmb8qqs.js"></script>
 		<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    
+		
 		<script type="text/javascript" src="scripts/tc.util.js"></script>
 		<script type="text/javascript" src="scripts/tc.app.particle.panel.js"></script>
 		<script type="text/javascript" src="scripts/tc.app.particle.context.js"></script>
@@ -41,19 +41,20 @@ <h1><span>Type/Code</span></h1>
 		<script type="text/javascript" charset="utf-8">
 			
 			YUI().use('io','json','node','event-custom','node-event-simulate','util',
-			'event-resize',function(Y){
+			'event-resize', 'anim', function(Y){
 				app.initialize(Y);
 			});
 			
 			var _gaq = _gaq || [];
-			_gaq.push(['_setAccount', 'UA-20012698-1']);
+			_gaq.push(['_setAccount', 'UA-13114017-1']);
 			_gaq.push(['_trackPageview']);
-		
+			
 			(function() {
 				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 			})();
+			
 		</script>
 	</body>
 </html>
diff --git a/scripts/tc.app.js b/scripts/tc.app.js
@@ -20,4 +20,17 @@ var app = {
       tc.util.log('Not webkit...falling back to static logo');
       app.Y.Node.one('body').addClass('fallback');
     }
+    app.fadeInContent();
+  };
+  
+  app.fadeInContent = function() {
+    var fadeIn = new app.Y.Anim({
+      node: '.content',
+      to: {
+        opacity: 1
+      }
+    });
+    //fadeIn.set('duration', );
+    
+    fadeIn.run();
   };
diff --git a/scripts/tc.app.particle.panel.js b/scripts/tc.app.particle.panel.js
@@ -66,12 +66,6 @@ if(!tc){ var tc = {}; }
                 diameter,
                 diameter
               );
-              //context.fillRect(
-              //  this.anchor.elements[0]+this.radius,
-              //  this.anchor.elements[1]+this.radius,
-              //  1,
-              //  1
-              //)
             }
           }));
         })(arr[i]);
