aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/tools-properties/fill-properties.reel/fill-properties.html
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html10
1 files changed, 5 insertions, 5 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 b81b09ba..77a0af5e 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,13 +34,13 @@
34 </head> 34 </head>
35 35
36 <body> 36 <body>
37 <div id="fillProperties" class="subToolHolderPanel"> 37 <div data-montage-id="fillProperties" class="subToolHolderPanel">
38 <label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label> 38 <label class="label subOption"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>
39 39
40 <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> 40 <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
41 <label class="label"> Materials:</label> 41 <label class="label"> Materials:</label>
42 <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> 42 <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div>
43 <select id="fillMaterialCB" class="nj-skinned"> 43 <select data-montage-id="fillMaterialCB" class="nj-skinned">
44 </select> 44 </select>
45 </div> 45 </div>
46 </div> 46 </div>