aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 16:06:56 -0700
committerValerio Virgillito2012-05-16 16:06:56 -0700
commit92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch)
treee385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/zoom-properties.reel/zoom-properties.html
parentbdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/zoom-properties.reel/zoom-properties.html')
-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>