907538da by Dan Rempel

Minor tweaks, now for client approval.

1 parent 4f2b95d2
...@@ -278,15 +278,15 @@ ...@@ -278,15 +278,15 @@
278 } 278 }
279 #logo-green{ 279 #logo-green{
280 left:-200px; 280 left:-200px;
281 top: 589px; 281 top: 588px;
282 } 282 }
283 #logo-yellow{ 283 #logo-yellow{
284 left:305px; 284 left:305px;
285 top: 555px; 285 top: 554px;
286 } 286 }
287 #logo-red{ 287 #logo-red{
288 left:100px; 288 left:100px;
289 top: 566px; 289 top: 564px;
290 opacity: 0; 290 opacity: 0;
291 } 291 }
292 292
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
302 } 302 }
303 303
304 #last-frame-group{ 304 #last-frame-group{
305 background: url(assets/collage.jpg) no-repeat; 305 background: url(assets/collage.jpg) no-repeat -1px -1px;
306 position: absolute; 306 position: absolute;
307 width: 100%; 307 width: 100%;
308 height: 386px; 308 height: 386px;
...@@ -404,17 +404,19 @@ ...@@ -404,17 +404,19 @@
404 /* tlElements.to("#line-img-group", fadeUpDuration, {opacity:0, delay:4 }); */ 404 /* tlElements.to("#line-img-group", fadeUpDuration, {opacity:0, delay:4 }); */
405 tlElements.to("#tag-logo-group", fadeUpDuration, {opacity:1, delay:4 }); 405 tlElements.to("#tag-logo-group", fadeUpDuration, {opacity:1, delay:4 });
406 tlElements.to("#last-frame-group",fadeUpDuration, {opacity:1, delay:-1 }); 406 tlElements.to("#last-frame-group",fadeUpDuration, {opacity:1, delay:-1 });
407 tlElements.to("#tag1", fadeUpDuration, {left:40, delay:0 }); 407
408 tlElements.to("#tag2", fadeUpDuration, {left:40, delay:0 });
409 tlElements.to("#leaf", fadeUpDuration, {left:213, delay:-.2 });
410 tlElements.to("#logo-green", fadeUpDuration, {left:180, delay:0 }); 408 tlElements.to("#logo-green", fadeUpDuration, {left:180, delay:0 });
411 tlElements.to("#logo-yellow", fadeUpDuration, {left:125, delay:-.5 }); 409 tlElements.to("#logo-yellow", fadeUpDuration, {left:125, delay:-.5 });
412 tlElements.to("#logo-red", fadeUpDuration, {opacity:1, delay:-.5 }); 410 tlElements.to("#logo-red", fadeUpDuration, {opacity:1, delay:-.5 });
411
412 tlElements.to("#tag1", fadeUpDuration, {left:40, delay:0 });
413 tlElements.to("#tag2", fadeUpDuration, {left:40, delay:0 });
414 tlElements.to("#leaf", fadeUpDuration, {left:213, delay:-.2 });
413 415
414 tlLines.to("#line-red-logo", 1, {left:10, ease:Linear.easeNone, delay:3.4 }); 416 tlLines.to("#line-red-logo", 1, {left:15, ease:Linear.easeNone, delay:3.4 });
415 tlLines.to("#line-yellow-logo", 1, {top:140, ease:Linear.easeNone, delay:-1 }); 417 tlLines.to("#line-yellow-logo", 1, {top:135, ease:Linear.easeNone, delay:-1 });
416 tlLines.to("#line-yellow2-logo", 1, {top:190, ease:Linear.easeNone, delay:-1 }); 418 tlLines.to("#line-yellow2-logo", 1, {top:192, ease:Linear.easeNone, delay:-1 });
417 tlLines.to("#line-green-logo", 1, {left:80, ease:Linear.easeNone, delay:-1 }); 419 tlLines.to("#line-green-logo", 1, {left:85, ease:Linear.easeNone, delay:-1 });
418 420
419 421
420 tlCamera.to("#line-img-group", 6, {y:-50, ease:Power1.easeInOut, delay:0}); 422 tlCamera.to("#line-img-group", 6, {y:-50, ease:Power1.easeInOut, delay:0});
......
...@@ -268,20 +268,20 @@ ...@@ -268,20 +268,20 @@
268 top: 35px; 268 top: 35px;
269 } 269 }
270 #leaf{ 270 #leaf{
271 left:800px; 271 left:443px;
272 top: 35px; 272 top: -20px;
273 } 273 }
274 #logo-green{ 274 #logo-green{
275 left:-300px; 275 left:-300px;
276 top: 78px; 276 top: 77px;
277 } 277 }
278 #logo-yellow{ 278 #logo-yellow{
279 left:800px; 279 left:800px;
280 top: 46px; 280 top: 45px;
281 } 281 }
282 #logo-red{ 282 #logo-red{
283 left:527px; 283 left:527px;
284 top: 56px; 284 top: 55px;
285 opacity: 0; 285 opacity: 0;
286 } 286 }
287 287
...@@ -394,13 +394,13 @@ ...@@ -394,13 +394,13 @@
394 tlElements.to("#img6", fadeUpDuration, {opacity:1, scaleX:1, scaleY:1, ease:Back.easeOut.config(1.7), delay:0 }); 394 tlElements.to("#img6", fadeUpDuration, {opacity:1, scaleX:1, scaleY:1, ease:Back.easeOut.config(1.7), delay:0 });
395 395
396 396
397 tlElements.to("#line-img-group", fadeUpDuration, {opacity:0, delay:2 }); 397 tlElements.to("#line-img-group", fadeUpDuration, {opacity:0, delay:2.5 });
398 tlElements.to("#tag-logo-group", fadeUpDuration, {opacity:1, delay:-1 }); 398 tlElements.to("#tag-logo-group", fadeUpDuration, {opacity:1, delay:-2 });
399 tlElements.to("#tag", fadeUpDuration, {left:44, delay:0 }); 399 tlElements.to("#logo-green", fadeUpDuration, {left:606, delay:-2 });
400 tlElements.to("#leaf", fadeUpDuration, {left:443, delay:-.5 }); 400 tlElements.to("#logo-yellow", fadeUpDuration, {left:553, delay:-2 });
401 tlElements.to("#logo-green", fadeUpDuration, {left:606, delay:0 }); 401 tlElements.to("#logo-red", fadeUpDuration, {opacity:1, delay:-1.7 });
402 tlElements.to("#logo-yellow", fadeUpDuration, {left:553, delay:-.5 }); 402 tlElements.to("#tag", fadeUpDuration, {left:44, delay:-1.5 });
403 tlElements.to("#logo-red", fadeUpDuration, {opacity:1, delay:0 }); 403 tlElements.to("#leaf", fadeUpDuration-.25, {top:35, delay:-1.2 });
404 /// 404 ///
405 405
406 406
......