diff options
| author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
| commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
| tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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 | 10 |
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> |