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/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
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/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 990dc739..cef44f31 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |||
@@ -38,11 +38,11 @@ | |||
38 | </script> | 38 | </script> |
39 | </head> | 39 | </head> |
40 | <body> | 40 | <body> |
41 | <div id="section"> | 41 | <div data-montage-id="section"> |
42 | <section class="fieldCol"> | 42 | <section class="fieldCol"> |
43 | <article class="fieldRow colorSelect"> | 43 | <article class="fieldRow colorSelect"> |
44 | <div id="Stroke"></div> | 44 | <div data-montage-id="Stroke"></div> |
45 | <div id="Fill"></div> | 45 | <div data-montage-id="Fill"></div> |
46 | </article> | 46 | </article> |
47 | </section> | 47 | </section> |
48 | </div> | 48 | </div> |