aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/rect-properties.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/rect-properties.reel
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 47eff533..01f2b1da 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -74,17 +74,17 @@
74 </head> 74 </head>
75 75
76 <body> 76 <body>
77 <div id="rectProperties" class="rectProperties"> 77 <div data-montage-id="rectProperties" class="rectProperties">
78 <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> 78 <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>-->
79 <button id="lockButton" class="unlock" style="margin-left:20px"></button> 79 <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button>
80 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 80 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
81 <div id="TLRadiusControl" class="label"></div> 81 <div data-montage-id="TLRadiusControl" class="label"></div>
82 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> 82 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div>
83 <div id="TRRadiusControl" class="label"></div> 83 <div data-montage-id="TRRadiusControl" class="label"></div>
84 <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> 84 <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div>
85 <div id="BLRadiusControl" class="label"></div> 85 <div data-montage-id="BLRadiusControl" class="label"></div>
86 <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> 86 <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div>
87 <div id="BRRadiusControl" class="label"></div> 87 <div data-montage-id="BRRadiusControl" class="label"></div>
88 </div> 88 </div>
89 </body> 89 </body>
90 90