aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/components/tools-properties/pen-properties.reel
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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>