diff options
author | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
commit | ad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch) | |
tree | 35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/components/ui/color-chip.reel/color-chip.html | |
parent | 3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff) | |
parent | 3ebed34665fa73b0ce613b400f3029ebf4476439 (diff) | |
download | ninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
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 |