diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/ui/color-chip.reel/color-chip.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/ui/color-chip.reel/color-chip.html')
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 8f10092d..647f7e79 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html | |||
| @@ -23,13 +23,11 @@ | |||
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> | 25 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> |
| 26 | <div id="colorChipContainer" class="colortoolbar"> | 26 | <div data-montage-id="colorChipContainer" class="colortoolbar"> |
| 27 | 27 | <div data-montage-id="chipIcon"></div> | |
| 28 | <div id="chipIcon"></div> | 28 | <div class="chipContainer"> |
| 29 | 29 | <button data-montage-id="chipButton"></button> | |
| 30 | <div class="chipContainer"><button id="chipButton"></button></div> | 30 | </div> |
| 31 | |||
| 32 | </div> | 31 | </div> |
| 33 | |||
| 34 | </body> | 32 | </body> |
| 35 | </html> \ No newline at end of file | 33 | </html> \ No newline at end of file |