diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/tools-properties/shape-properties.reel | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 117664a3..6d58fe80 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -127,30 +127,30 @@ | |||
| 127 | </head> | 127 | </head> |
| 128 | 128 | ||
| 129 | <body> | 129 | <body> |
| 130 | <div id="shapeProperties" class="subToolHolderPanel"> | 130 | <div data-montage-id="shapeProperties" class="subToolHolderPanel"> |
| 131 | <div id="shapeToolsList"> | 131 | <div data-montage-id="shapeToolsList"> |
| 132 | <div id="toolbutton"></div> | 132 | <div data-montage-id="toolbutton"></div> |
| 133 | </div> | 133 | </div> |
| 134 | 134 | ||
| 135 | <label class="label">Stroke:</label> | 135 | <label class="label">Stroke:</label> |
| 136 | <div id="strokeControl" class="label"></div> | 136 | <div data-montage-id="strokeControl" class="label"></div> |
| 137 | 137 | ||
| 138 | <div id="customProperties"> | 138 | <div id="customProperties"> |
| 139 | <div id="ovalProperties" class="label"></div> | 139 | <div data-montage-id="ovalProperties" class="label"></div> |
| 140 | <div id="rectProperties" class="label"></div> | 140 | <div data-montage-id="rectProperties" class="label"></div> |
| 141 | <div id="lineProperties" class="label"></div> | 141 | <div data-montage-id="lineProperties" class="label"></div> |
| 142 | </div> | 142 | </div> |
| 143 | 143 | ||
| 144 | <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> | 144 | <label class="label subOption optionLabel"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> |
| 145 | 145 | ||
| 146 | <label id="materialLabel" class="label">Material:</label> | 146 | <label data-montage-id="materialLabel" class="label">Material:</label> |
| 147 | <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div> | 147 | <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div> |
| 148 | 148 | ||
| 149 | <select class="selectBox" id="strokeMaterialCB"> | 149 | <select class="selectBox" data-montage-id="strokeMaterialCB"> |
| 150 | </select> | 150 | </select> |
| 151 | 151 | ||
| 152 | <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> | 152 | <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div> |
| 153 | <select class="selectBox" id="fillMaterialCB"> | 153 | <select class="selectBox" data-montage-id="fillMaterialCB"> |
| 154 | </select> | 154 | </select> |
| 155 | 155 | ||
| 156 | 156 | ||