diff options
author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/components/ui/color-chip.reel | |
parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/ui/color-chip.reel')
-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 |