diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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> |