diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties/fill-properties.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
| -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> |