diff options
| author | Jonathan Duran | 2012-04-06 08:46:42 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-06 08:46:42 -0700 |
| commit | 852f49888e54b4a2a8ee929dbeb0c54dfa004de6 (patch) | |
| tree | d90b53a70e0c14992db62fc0705b830f75cec52e /js/panels/Timeline/Layer.reel/Layer.html | |
| parent | 921a106cc1159b93068a4c635fcc0c74084446a5 (diff) | |
| parent | eb694fa5d39733264bce7ba832aabbe9c3d6c81e (diff) | |
| download | ninja-852f49888e54b4a2a8ee929dbeb0c54dfa004de6.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 454c2742..eb9ff3a9 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -337,14 +337,14 @@ | |||
| 337 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> | 337 | <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> |
| 338 | </div> | 338 | </div> |
| 339 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> | 339 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> |
| 340 | <div class="layout-table"> | 340 | <div class="layout-tablew"> |
| 341 | <div class="layout-row"> | 341 | <div class="container-row"> |
| 342 | <div class="layout-cell">X</div> | 342 | <div class="cell-property">X</div> |
| 343 | <div class="layout-cell"><div data-montage-id="position-x"></div></div> | 343 | <div class="cell-value"><div data-montage-id="position-x"></div></div> |
| 344 | </div> | 344 | </div> |
| 345 | <div class="layout-row"> | 345 | <div class="container-row"> |
| 346 | <div class="layout-cell">Y</div> | 346 | <div class="cell-property">Y</div> |
| 347 | <div class="layout-cell"><div data-montage-id="position-y"></div></div> | 347 | <div class="cell-value"><div data-montage-id="position-y"></div></div> |
| 348 | </div> | 348 | </div> |
| 349 | </div> | 349 | </div> |
| 350 | </div> | 350 | </div> |
| @@ -353,26 +353,26 @@ | |||
| 353 | <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span> | 353 | <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span> |
| 354 | </div> | 354 | </div> |
| 355 | <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform"> | 355 | <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform"> |
| 356 | <div class="layout-table"> | 356 | <div class="layout-tablew"> |
| 357 | <div class="layout-row"> | 357 | <div class="container-row"> |
| 358 | <div class="layout-cell">Scale X</div> | 358 | <div class="cell-property">Scale X</div> |
| 359 | <div class="layout-cell"><div data-montage-id="scale-x"></div></div> | 359 | <div class="cell-value"><div data-montage-id="scale-x"></div></div> |
| 360 | </div> | 360 | </div> |
| 361 | <div class="layout-row"> | 361 | <div class="container-row"> |
| 362 | <div class="layout-cell">Scale Y</div> | 362 | <div class="cell-property">Scale Y</div> |
| 363 | <div class="layout-cell"><div data-montage-id="scale-y"></div></div> | 363 | <div class="cell-value"><div data-montage-id="scale-y"></div></div> |
| 364 | </div> | 364 | </div> |
| 365 | <div class="layout-row"> | 365 | <div class="container-row"> |
| 366 | <div class="layout-cell">Skew X</div> | 366 | <div class="cell-property">Skew X</div> |
| 367 | <div class="layout-cell"><div data-montage-id="skew-x"></div></div> | 367 | <div class="cell-value"><div data-montage-id="skew-x"></div></div> |
| 368 | </div> | 368 | </div> |
| 369 | <div class="layout-row"> | 369 | <div class="container-row"> |
| 370 | <div class="layout-cell">Skew Y</div> | 370 | <div class="cell-property">Skew Y</div> |
| 371 | <div class="layout-cell"><div data-montage-id="skew-y"></div></div> | 371 | <div class="cell-value"><div data-montage-id="skew-y"></div></div> |
| 372 | </div> | 372 | </div> |
| 373 | <div class="layout-row"> | 373 | <div class="container-row"> |
| 374 | <div class="layout-cell">Rotation</div> | 374 | <div class="cell-property">Rotation</div> |
| 375 | <div class="layout-cell"><div data-montage-id="rotation"></div></div> | 375 | <div class="cell-value"><div data-montage-id="rotation"></div></div> |
| 376 | </div> | 376 | </div> |
| 377 | </div> | 377 | </div> |
| 378 | 378 | ||