aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel/selection-properties.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/selection-properties.reel/selection-properties.html
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.html')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html4
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>