aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.html
diff options
context:
space:
mode:
authorAnanya Sen2012-05-31 10:13:40 -0700
committerAnanya Sen2012-05-31 10:13:40 -0700
commit286457b4f23974277274ba388afd283e8aa085cb (patch)
treec21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/tools-properties/fill-properties.reel/fill-properties.html
parent4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff)
parentd49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
downloadninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html19
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">&nbsp;</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>