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/position-and-size.reel/position-and-size.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/position-and-size.reel/position-and-size.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index 59bbe346..a7aac84e 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |||
| @@ -92,33 +92,33 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 92 | </script> | 92 | </script> |
| 93 | </head> | 93 | </head> |
| 94 | <body> | 94 | <body> |
| 95 | <div id="section" class="sectional"> | 95 | <div data-montage-id="section" class="sectional"> |
| 96 | <section id="position" class="fieldCol"> | 96 | <section data-montage-id="position" class="fieldCol"> |
| 97 | <label id="labelX">Left:</label> | 97 | <label data-montage-id="labelX">Left:</label> |
| 98 | <article class="fieldRow twoCol"> | 98 | <article class="fieldRow twoCol"> |
| 99 | <div> | 99 | <div> |
| 100 | <div class="inputField"> | 100 | <div class="inputField"> |
| 101 | <div id="PosX"></div> | 101 | <div data-montage-id="PosX"></div> |
| 102 | </div> | 102 | </div> |
| 103 | </div> | 103 | </div> |
| 104 | <div> | 104 | <div> |
| 105 | <div> | 105 | <div> |
| 106 | <label id="labelY">Top:</label> | 106 | <label data-montage-id="labelY">Top:</label> |
| 107 | </div> | 107 | </div> |
| 108 | <div class="inputField"> | 108 | <div class="inputField"> |
| 109 | <div id="PosY"></div> | 109 | <div data-montage-id="PosY"></div> |
| 110 | </div> | 110 | </div> |
| 111 | </div> | 111 | </div> |
| 112 | </article> | 112 | </article> |
| 113 | </section> | 113 | </section> |
| 114 | <hr /> | 114 | <hr /> |
| 115 | <section class="fieldCol"> | 115 | <section class="fieldCol"> |
| 116 | <button id="posBound" class="unlock"></button> | 116 | <button data-montage-id="posBound" id="posBound" class="unlock"></button> |
| 117 | <label>Width:</label> | 117 | <label>Width:</label> |
| 118 | <article class="fieldRow twoCol"> | 118 | <article class="fieldRow twoCol"> |
| 119 | <div> | 119 | <div> |
| 120 | <div class="inputField"> | 120 | <div class="inputField"> |
| 121 | <div id="PosW"></div> | 121 | <div data-montage-id="PosW"></div> |
| 122 | </div> | 122 | </div> |
| 123 | </div> | 123 | </div> |
| 124 | <div> | 124 | <div> |
| @@ -126,7 +126,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 126 | <label>Height:</label> | 126 | <label>Height:</label> |
| 127 | </div> | 127 | </div> |
| 128 | <div class="inputField"> | 128 | <div class="inputField"> |
| 129 | <div id="PosH"></div> | 129 | <div data-montage-id="PosH"></div> |
| 130 | </div> | 130 | </div> |
| 131 | </div> | 131 | </div> |
| 132 | </article> | 132 | </article> |