diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@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 | 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> |