aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/zoom-properties.reel
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/zoom-properties.reel')
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
index cf22b775..7a830f2a 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
@@ -27,9 +27,9 @@
27 27
28 <body> 28 <body>
29 <div data-montage-id="zoomProperties" class="subToolHolderPanel"> 29 <div data-montage-id="zoomProperties" class="subToolHolderPanel">
30 <div id="zoomToolOptionHolder" class="subToolButton"> 30 <div id="zoomToolOptionHolder" class="toolOptionsFloatChildren">
31 <input data-montage-id="zoomInTool" id="zoomInTool" type="radio" name="zoomRadio" class="zoom-option" title="Zoom In"checked/> 31 <input data-montage-id="zoomInTool" id="zoomInTool" type="radio" name="zoomRadio" class="toolOptsRadioButton zoomInToolIcon" title="Zoom In"checked/>
32 <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/> 32 <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" class="toolOptsRadioButton zoomOutToolIcon" title="Zoom Out"/>
33 </div> 33 </div>
34 </div> 34 </div>
35 </body> 35 </body>