diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties/selection-properties.reel/selection-properties.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.html')
| -rwxr-xr-x | js/components/tools-properties/selection-properties.reel/selection-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index f0b907af..b93aacd0 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html | |||
| @@ -25,8 +25,8 @@ | |||
| 25 | </head> | 25 | </head> |
| 26 | 26 | ||
| 27 | <body> | 27 | <body> |
| 28 | <div id="selectionProperties" class="subToolHolderPanel"> | 28 | <div data-montage-id="selectionProperties" class="subToolHolderPanel"> |
| 29 | <label class="label subOption optionLabel"><input id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label> | 29 | <label class="label subOption optionLabel"><input data-montage-id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label> |
| 30 | <div id="toolPropertiesPanel-selectionDivOptions"> | 30 | <div id="toolPropertiesPanel-selectionDivOptions"> |
| 31 | <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> | 31 | <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> |
| 32 | <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> | 32 | <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> |