diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@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> |