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/properties.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/properties.html')
| -rwxr-xr-x | js/panels/properties.reel/properties.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index 554d1477..3a1ae880 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html | |||
| @@ -105,26 +105,26 @@ | |||
| 105 | </script> | 105 | </script> |
| 106 | </head> | 106 | </head> |
| 107 | <body> | 107 | <body> |
| 108 | <section id="propertiesPanel" class="propertiesPanel"> | 108 | <section data-montage-id="propertiesPanel" class="propertiesPanel"> |
| 109 | <section class="sectional"> | 109 | <section class="sectional"> |
| 110 | <section class="fieldCol"> | 110 | <section class="fieldCol"> |
| 111 | <label>Element:</label> | 111 | <label>Element:</label> |
| 112 | <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article> | 112 | <article class="fieldRow"><input type="text" data-montage-id="elementName" class="nj-skinned" readonly="readonly"></article> |
| 113 | </section> | 113 | </section> |
| 114 | <section class="fieldCol"> | 114 | <section class="fieldCol"> |
| 115 | <label>ID:</label> | 115 | <label>ID:</label> |
| 116 | <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article> | 116 | <article class="fieldRow"><input type="text" data-montage-id="elementId" class="nj-skinned" /></article> |
| 117 | </section> | 117 | </section> |
| 118 | <section class="fieldCol"> | 118 | <section class="fieldCol"> |
| 119 | <label>Class:</label> | 119 | <label>Class:</label> |
| 120 | <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article> | 120 | <article class="fieldRow"><input type="text" data-montage-id="elementClass" class="nj-skinned" /></article> |
| 121 | </section> | 121 | </section> |
| 122 | </section> | 122 | </section> |
| 123 | <section id="PosSize"></section> | 123 | <section data-montage-id="PosSize"></section> |
| 124 | <section id="customSections"> | 124 | <section data-montage-id="customSections"> |
| 125 | <div id="customSection"></div> | 125 | <div data-montage-id="customSection"></div> |
| 126 | </section> | 126 | </section> |
| 127 | <section id="threeD"></section> | 127 | <section data-montage-id="threeD"></section> |
| 128 | </section> | 128 | </section> |
| 129 | </body> | 129 | </body> |
| 130 | </html> \ No newline at end of file | 130 | </html> \ No newline at end of file |