aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel/selection-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/selection-properties.reel/selection-properties.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.html')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
1 files changed, 3 insertions, 3 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 3d2456c6..2a791542 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -25,13 +25,13 @@
25 </head> 25 </head>
26 26
27 <body> 27 <body>
28 <div id="selectionProperties" class="subToolHolderPanel optionsSelectionTool"> 28 <div data-montage-id="selectionProperties" class="subToolHolderPanel optionsSelectionTool">
29 <input id="transformCheck" type="checkbox" name="transformControl" class="nj-skinned"/><label class="label">Transform Controls&nbsp&nbsp</label> 29 <input data-montage-id="transformCheck" type="checkbox" name="transformControl" class="nj-skinned"/><label class="label">Transform Controls&nbsp&nbsp</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>
33 <div class="subOption subOptionSpacer"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div> 33 <div class="subOption subOptionSpacer"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div>
34 <div class="subOption "><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div> 34 <div class="subOption"><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div>
35 <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div> 35 <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div>
36 <div class="subOption subOptionSpacer"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div> 36 <div class="subOption subOptionSpacer"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div>
37 <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div> 37 <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div>