diff options
| author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
| commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
| tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/oval-properties.reel/oval-properties.html | |
| parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-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/oval-properties.reel/oval-properties.html')
| -rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index c76e8c39..21308be6 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | </head> | 35 | </head> |
| 36 | 36 | ||
| 37 | <body> | 37 | <body> |
| 38 | <div data-montage-id="ovalProperties"> | 38 | <div data-montage-id="ovalProperties" class="ovalProperties toolOptionsFloatChildren"> |
| 39 | <label class="label">Inner Radius:</label> | 39 | <label>Inner Radius:</label> |
| 40 | <div data-montage-id="innerRadiusControl" class="label"></div> | 40 | <div data-montage-id="innerRadiusControl"></div> |
| 41 | </div> | 41 | </div> |
| 42 | </body> | 42 | </body> |
| 43 | 43 | ||