diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/ui/color-chip.reel | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 |