summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/button.js11
-rw-r--r--client/colors.less15
-rw-r--r--client/templates/photos.html4
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>