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/fill-properties.reel/fill-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/fill-properties.reel/fill-properties.html')
| -rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 77a0af5e..734966dc 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -23,23 +23,30 @@ | |||
| 23 | "prototype": "js/components/tools-properties/fill-properties.reel", | 23 | "prototype": "js/components/tools-properties/fill-properties.reel", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "fillProperties"}, | 25 | "element": {"#": "fillProperties"}, |
| 26 | |||
| 27 | "_fillColorCtrl": {"#": "fillColorCtrl"}, | ||
| 28 | |||
| 26 | "_useWebGL": {"#": "useWebGLCH"}, | 29 | "_useWebGL": {"#": "useWebGLCH"}, |
| 27 | "_materialsContainer": {"#": "materialsContainer"}, | 30 | "_materialsContainer": {"#": "materialsContainer"}, |
| 28 | "_fillMaterial": {"@": "_fillMaterialCB"} | 31 | "_fillMaterial": {"@": "_fillMaterialCB"} |
| 29 | } | 32 | } |
| 30 | } | 33 | } |
| 31 | } | 34 | } |
| 32 | </script> | 35 | </script> |
| 33 | 36 | ||
| 34 | </head> | 37 | </head> |
| 35 | 38 | ||
| 36 | <body> | 39 | <body> |
| 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel"> | 40 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> |
| 38 | <label class="label subOption"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label> | 41 | <div class="toolColorChipIcon FillTool"></div> |
| 42 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | ||
| 43 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | ||
| 39 | 44 | ||
| 40 | <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> | 45 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> |
| 41 | <label class="label"> Materials:</label> | 46 | <label class="label">Use WebGL</label> |
| 42 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 47 | <div data-montage-id="materialsContainer" class="materialsContainerOptions toolOptionsFloatChildren"> |
| 48 | <label class="label">Material:</label> | ||
| 49 | <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> | ||
| 43 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> | 50 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> |
| 44 | </select> | 51 | </select> |
| 45 | </div> | 52 | </div> |