diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/fill-properties.reel/fill-properties.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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 abc2e843..fb59e2a8 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
| @@ -34,12 +34,12 @@ | |||
| 34 | </head> | 34 | </head> |
| 35 | 35 | ||
| 36 | <body> | 36 | <body> |
| 37 | <div id="fillProperties" class="subToolHolderPanel optionsFillTool"> | 37 | <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool"> |
| 38 | <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> | 38 | <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> |
| 39 | <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> | 39 | <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> |
| 40 | <label class="label"> Materials:</label> | 40 | <label class="label"> Materials:</label> |
| 41 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 41 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> |
| 42 | <select id="fillMaterialCB" class="nj-skinned"> | 42 | <select data-montage-id="fillMaterialCB" class="nj-skinned"> |
| 43 | </select> | 43 | </select> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |