diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/tools-properties/zoom-properties.reel | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/tools-properties/zoom-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/zoom-properties.reel/zoom-properties.html | 6 |
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 e36d7ca7..cf22b775 100755 --- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html +++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html | |||
| @@ -26,10 +26,10 @@ | |||
| 26 | </head> | 26 | </head> |
| 27 | 27 | ||
| 28 | <body> | 28 | <body> |
| 29 | <div id="zoomProperties" class="subToolHolderPanel"> | 29 | <div data-montage-id="zoomProperties" class="subToolHolderPanel"> |
| 30 | <div id="zoomToolOptionHolder" class="subToolButton"> | 30 | <div id="zoomToolOptionHolder" class="subToolButton"> |
| 31 | <input 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="zoom-option" title="Zoom In"checked/> |
| 32 | <input id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/> | 32 | <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/> |
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
| 35 | </body> | 35 | </body> |