diff options
| author | Yuval Adam <yuval@y3xz.com> | 2015-06-30 17:28:20 +0300 |
|---|---|---|
| committer | Yuval Adam <yuval@y3xz.com> | 2015-06-30 17:28:20 +0300 |
| commit | 551dd70061eb8c1bf6adb958848395bbd55b9a7f (patch) | |
| tree | b55a3b554cfe9337e1d97b5a76b0e2a8527abc55 /client | |
| parent | a4334bec763e0691b80ea510ecf743f18ffa1006 (diff) | |
Fix dominants hex values
Diffstat (limited to 'client')
| -rw-r--r-- | client/button.js | 4 | ||||
| -rw-r--r-- | client/templates/photos.html | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/client/button.js b/client/button.js index 5e03a1f..3670c0e 100644 --- a/client/button.js +++ b/client/button.js @@ -55,12 +55,12 @@ function animate() { $('div#dominant1').css('background', 'rgba(' + palette[0][0] + ',' + palette[0][1] + ',' + palette[0][2] + ',1)'); $('div#dominant2').css('background', 'rgba(' + palette[1][0] + ',' + palette[1][1] + ',' + palette[1][2] + ',1)'); - $('div#dominant1').siblings('h5').text('#' + $('h5#dominant1').text('#' + palette[0][0].toString(16).toUpperCase() + palette[0][1].toString(16).toUpperCase() + palette[0][2].toString(16).toUpperCase() ) - $('div#dominant2').siblings('h5').text('#' + $('h5#dominant2').text('#' + palette[1][0].toString(16).toUpperCase() + palette[1][1].toString(16).toUpperCase() + palette[1][2].toString(16).toUpperCase() diff --git a/client/templates/photos.html b/client/templates/photos.html index 6a9b9c6..c45a831 100644 --- a/client/templates/photos.html +++ b/client/templates/photos.html @@ -24,12 +24,12 @@ <div class="dominant"> <h3>Dominant color #1</h3> <div id="dominant1" class="color"></div> - <h5>#AABBCC</h5> + <h5 id="dominant1">#AABBCC</h5> </div> <div class="dominant"> <h3>Dominant color #2</h3> <div id="dominant2" class="color"></div> - <h5>#AABBCC</h5> + <h5 id="dominant2">#AABBCC</h5> </div> <button class="continue">Continue</button> </div> @@ -37,9 +37,9 @@ <canvas id="canvas-final" style="height: 315px; width: 315px;"></canvas> <div class="final-dominants"> <div id="dominant1" class="color"></div> - <h5>#AABBCC</h5> + <h5 id="dominant1">#AABBCC</h5> <div id="dominant2" class="color"></div> - <h5>#AABBCC</h5> + <h5 id="dominant2">#AABBCC</h5> </div> <div class="share" style="display: none;"> <p>Now what...?</p> |