aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/selection-properties.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html7
1 files changed, 3 insertions, 4 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 261a0177..b93aacd0 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "owner": { 15 "owner": {
16 "module": "js/components/tools-properties/selection-properties.reel", 16 "prototype": "js/components/tools-properties/selection-properties.reel",
17 "name": "SelectionProperties",
18 "properties": { 17 "properties": {
19 "element": {"#": "selectionProperties"}, 18 "element": {"#": "selectionProperties"},
20 "transform": {"#": "transformCheck"} 19 "transform": {"#": "transformCheck"}
@@ -26,8 +25,8 @@
26 </head> 25 </head>
27 26
28 <body> 27 <body>
29 <div id="selectionProperties" class="subToolHolderPanel"> 28 <div data-montage-id="selectionProperties" class="subToolHolderPanel">
30 <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>
31 <div id="toolPropertiesPanel-selectionDivOptions"> 30 <div id="toolPropertiesPanel-selectionDivOptions">
32 <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>
33 <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>