diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@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> |