diff options
| author | Yuval Adam <yuval@y3xz.com> | 2015-06-21 18:13:17 +0300 |
|---|---|---|
| committer | Yuval Adam <yuval@y3xz.com> | 2015-06-21 18:13:17 +0300 |
| commit | 8d3211f6988c9ccf71ec1b8f7e293f8f4d653250 (patch) | |
| tree | c6e1a4e4a4b8d8b3e4bc9c639e2319e846ec4142 /client | |
| parent | c04a21af7f627969e95626e1d757a02d37710faf (diff) | |
Cleanup final steps
Diffstat (limited to 'client')
| -rw-r--r-- | client/button.js | 11 | ||||
| -rw-r--r-- | client/colors.less | 15 | ||||
| -rw-r--r-- | client/templates/photos.html | 4 |
3 files changed, 26 insertions, 4 deletions
diff --git a/client/button.js b/client/button.js index 889d2b8..f2b2d71 100644 --- a/client/button.js +++ b/client/button.js @@ -108,6 +108,17 @@ function animate2() { Effects.drawFinalIcon(); }, delay + 2000); + delay += 400 * photos.length; + delay += 2000; + + _.delay(function() { + $('li#step7').removeClass('active'); + $('li#step8').addClass('active'); + $('div.final div.final-dominants').hide(); + $('div.final div.share').show(); + }, delay + 2000); + + } Template.layout.events({ diff --git a/client/colors.less b/client/colors.less index 6a5a25b..d7dd7b9 100644 --- a/client/colors.less +++ b/client/colors.less @@ -213,8 +213,19 @@ body { text-align: center; display: flex; justify-content: center; - div.dominants { - + div.final-dominants { + margin-left: 40px; + width: 260px; + div.color { + background-color: red; + height: 50px; + width: 100%; + } + h5 { + color: #999; + margin-top: 10px; + text-align: left; + } } div.share { margin-left: 40px; diff --git a/client/templates/photos.html b/client/templates/photos.html index 50e29bc..2d7441a 100644 --- a/client/templates/photos.html +++ b/client/templates/photos.html @@ -29,13 +29,13 @@ </div> <div class="final" style="display: none"> <canvas id="canvas-final" style="height: 315px; width: 315px;"></canvas> - <div class="dominants"> + <div class="final-dominants"> <div id="dominant1" class="color"></div> <h5>#AABBCC</h5> <div id="dominant2" class="color"></div> <h5>#AABBCC</h5> </div> - <div class="share"> + <div class="share" style="display: none;"> <p>This is your icon! Now what...?</p> <button class="share-instagram">Share on Instagram</button> <button class="share-facebook">Share on Facebook</button> |