aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/tools-properties/pen-properties.reel
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index e835f69d..68ab85f6 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -40,7 +40,7 @@
40 <div data-montage-id="penProperties" class="subToolHolderPanel"> 40 <div data-montage-id="penProperties" class="subToolHolderPanel">
41 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> 41 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
42 <label class="label"> Stroke:</label> 42 <label class="label"> Stroke:</label>
43 <div id="strokeSize" class="label"></div> 43 <div data-montage-id="strokeSize" class="label"></div>
44 </div> 44 </div>
45 </div> 45 </div>
46 </body> 46 </body>