diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.html')
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 1c9505a0..70ed79f9 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
| @@ -30,9 +30,9 @@ | |||
| 30 | 30 | ||
| 31 | <body> | 31 | <body> |
| 32 | <div data-montage-id="object3DProperties" class="subToolHolderPanel"> | 32 | <div data-montage-id="object3DProperties" class="subToolHolderPanel"> |
| 33 | <div id="rotateObjectToolContainer" class="tagRadioButtons"> | 33 | <div class="tagRadioButtons object3DToolContainer"> |
| 34 | <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/> | 34 | <input type="radio" data-montage-id="rotateLocally" class="toolOptsRadioButton rotateLocally" title="Rotate Locally" name="rotateObject" checked/> |
| 35 | <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/> | 35 | <input type="radio" data-montage-id="rotateGlobally" class="toolOptsRadioButton rotateGlobally" title="Rotate Globally" name="rotateObject"/> |
| 36 | </div> | 36 | </div> |
| 37 | </div> | 37 | </div> |
| 38 | </body> | 38 | </body> |