diff options
| author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
| commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
| tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /js/components/tools-properties/oval-properties.reel | |
| parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel')
3 files changed, 22 insertions, 3 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css index 7f1b0f7f..ea0d92fc 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.css +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css | |||
| @@ -4,3 +4,14 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .ovalProperties{ | ||
| 8 | } | ||
| 9 | |||
| 10 | .ovalProperties hottextunit { | ||
| 11 | width: 22px; | ||
| 12 | } | ||
| 13 | |||
| 14 | .ovalProperties label { | ||
| 15 | margin-left: 6px; | ||
| 16 | margin-right: 6px; | ||
| 17 | } | ||
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 | ||
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index ddeb64ee..3edd9214 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js | |||
| @@ -24,6 +24,14 @@ exports.OvalProperties = Montage.create(ToolProperties, { | |||
| 24 | }, | 24 | }, |
| 25 | 25 | ||
| 26 | // Public API | 26 | // Public API |
| 27 | fill: { | ||
| 28 | get: function () { return this.base.fill; } | ||
| 29 | }, | ||
| 30 | |||
| 31 | stroke: { | ||
| 32 | get: function () { return this.base.stroke; } | ||
| 33 | }, | ||
| 34 | |||
| 27 | use3D: { | 35 | use3D: { |
| 28 | get: function() { return this.base._use3D; } | 36 | get: function() { return this.base._use3D; } |
| 29 | }, | 37 | }, |