aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel/shape-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/shape-properties.reel/shape-properties.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-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/shape-properties.reel/shape-properties.html')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html26
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