From 27ecdd40d3b7f225528848ef926887e88baaac11 Mon Sep 17 00:00:00 2001
From: Yuval Adam <yuval@y3xz.com>
Date: Tue, 14 Jul 2015 18:37:44 +0300
Subject: Partially animated logo

---
 client/button.js             |   8 ++++++++
 client/templates/layout.html |   2 +-
 public/img/logo.jpg          | Bin 0 -> 6779 bytes
 public/img/logo_anim.gif     | Bin 120822 -> 21286 bytes
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 public/img/logo.jpg

diff --git a/client/button.js b/client/button.js
index 2e15ca8..adb83a0 100644
--- a/client/button.js
+++ b/client/button.js
@@ -30,6 +30,8 @@ function prepareDates() {
 function animate() {
   var delay = 0;
 
+  $('img.logo').attr('src', '/img/logo_anim.gif');
+
   // load
   $('li#step1').addClass('active');
   var photos = $('div.photo');
@@ -95,6 +97,8 @@ function animate() {
     Session.set('dominant1hex', palette[0][0].toString(16).toUpperCase() + palette[0][1].toString(16).toUpperCase() + palette[0][2].toString(16).toUpperCase());
     Session.set('dominant2hex', palette[1][0].toString(16).toUpperCase() + palette[1][1].toString(16).toUpperCase() + palette[1][2].toString(16).toUpperCase());
 
+    $('img.logo').attr('src', '/img/logo.jpg');
+
     $('div.dominants').show();
   }, delay + 2000);
 }
@@ -103,6 +107,8 @@ function animate2() {
   var delay = 0;
   var photos = $('div.photo');
 
+  $('img.logo').attr('src', '/img/logo_anim.gif');
+
   _.delay(function() {
     $('li#step4').removeClass('active');
     $('li#step5').addClass('active');
@@ -150,6 +156,8 @@ function animate2() {
     $('span.final-date').text(months[Session.get('date').month-1] + ' ' + Session.get('date').year);
     $('div.final div.final-dominants').hide();
 
+    $('img.logo').attr('src', '/img/logo.jpg');
+
     $('div.final-userdate').show();
     $('div.final div.share').show();
     $('div.about-link').show();
diff --git a/client/templates/layout.html b/client/templates/layout.html
index c2c0e87..301c622 100644
--- a/client/templates/layout.html
+++ b/client/templates/layout.html
@@ -1,6 +1,6 @@
 <template name="layout">
   <div class="header">
-    <img class="logo" src="/img/logo_anim.gif">
+    <img class="logo" src="/img/logo.jpg">
     <div class="links">
       <a href="/about">About</a> /
       <a class="logout" href="#">Logout</a>
diff --git a/public/img/logo.jpg b/public/img/logo.jpg
new file mode 100644
index 0000000..a871bd0
Binary files /dev/null and b/public/img/logo.jpg differ
diff --git a/public/img/logo_anim.gif b/public/img/logo_anim.gif
index 4e33e4d..062dc46 100644
Binary files a/public/img/logo_anim.gif and b/public/img/logo_anim.gif differ
-- 
cgit v1.3.1