diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@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> |