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/rect-properties.reel | |
| 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/rect-properties.reel')
3 files changed, 18 insertions, 12 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css index cbd9dde8..dcb478e7 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.css +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css | |||
| @@ -12,11 +12,13 @@ | |||
| 12 | opacity: 0.7; | 12 | opacity: 0.7; |
| 13 | width: 17px; | 13 | width: 17px; |
| 14 | height: 18px; | 14 | height: 18px; |
| 15 | margin-right: 10px; | 15 | margin-right: 8px; |
| 16 | margin-left: 8px; | ||
| 17 | margin-top: 1px; | ||
| 16 | } | 18 | } |
| 17 | 19 | ||
| 18 | .rectProperties .subToolButton { | 20 | .rectProperties .subToolButton { |
| 19 | float:left; | 21 | margin-right: 7px; |
| 20 | } | 22 | } |
| 21 | 23 | ||
| 22 | .rectProperties .button:hover | 24 | .rectProperties .button:hover |
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 01f2b1da..42746caa 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html | |||
| @@ -74,18 +74,16 @@ | |||
| 74 | </head> | 74 | </head> |
| 75 | 75 | ||
| 76 | <body> | 76 | <body> |
| 77 | <div data-montage-id="rectProperties" class="rectProperties"> | 77 | <div data-montage-id="rectProperties" class="rectProperties toolOptionsFloatChildren"> |
| 78 | <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> | 78 | <button data-montage-id="lockButton" id="lockButton" class="unlock"></button> |
| 79 | <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button> | ||
| 80 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> | 79 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> |
| 81 | <div data-montage-id="TLRadiusControl" class="label"></div> | 80 | <div data-montage-id="TLRadiusControl" class=""></div> |
| 82 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> | 81 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> |
| 83 | <div data-montage-id="TRRadiusControl" class="label"></div> | 82 | <div data-montage-id="TRRadiusControl" class=""></div> |
| 84 | <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> | 83 | <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> |
| 85 | <div data-montage-id="BLRadiusControl" class="label"></div> | 84 | <div data-montage-id="BLRadiusControl" class=""></div> |
| 86 | <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> | 85 | <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> |
| 87 | <div data-montage-id="BRRadiusControl" class="label"></div> | 86 | <div data-montage-id="BRRadiusControl" class=""></div> |
| 88 | </div> | 87 | </div> |
| 89 | </body> | 88 | </body> |
| 90 | |||
| 91 | </html> \ No newline at end of file | 89 | </html> \ No newline at end of file |
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index f023f4bb..c1cb3945 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
| @@ -42,6 +42,14 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
| 42 | }, | 42 | }, |
| 43 | 43 | ||
| 44 | // Public API | 44 | // Public API |
| 45 | fill: { | ||
| 46 | get: function () { return this.base.fill; } | ||
| 47 | }, | ||
| 48 | |||
| 49 | stroke: { | ||
| 50 | get: function () { return this.base.stroke; } | ||
| 51 | }, | ||
| 52 | |||
| 45 | use3D: { | 53 | use3D: { |
| 46 | get: function() { return this.base._use3D; } | 54 | get: function() { return this.base._use3D; } |
| 47 | }, | 55 | }, |
| @@ -125,6 +133,4 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
| 125 | 133 | ||
| 126 | } | 134 | } |
| 127 | } | 135 | } |
| 128 | |||
| 129 | |||
| 130 | }); \ No newline at end of file | 136 | }); \ No newline at end of file |