diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/properties.reel/properties.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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 |