aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel/pen-properties.html
diff options
context:
space:
mode:
authorJon Reid2012-06-25 11:07:33 -0700
committerJon Reid2012-06-25 11:07:33 -0700
commit831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch)
treeaa6acda9aeddad8f93cae63b955349a442ddf01f /js/components/tools-properties/pen-properties.reel/pen-properties.html
parent82638621ed793fcb37438798363dba151efd9cd2 (diff)
parentda3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff)
downloadninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel/pen-properties.html')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
1 files changed, 2 insertions, 2 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 adb5cd7d..c77ac660 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -51,9 +51,9 @@
51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
52 52
53 <div class="toolColorChipIcon PencilTool"></div> 53 <div class="toolColorChipIcon PencilTool"></div>
54 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 54 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
55 <div class="toolColorChipIcon FillTool"></div> 55 <div class="toolColorChipIcon FillTool"></div>
56 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 56 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
57 <div class="nj-divider divider-vertical">&nbsp;</div> 57 <div class="nj-divider divider-vertical">&nbsp;</div>
58 <label class="label"> Stroke:</label> 58 <label class="label"> Stroke:</label>
59 <div data-montage-id="strokeSize" class="label"></div> 59 <div data-montage-id="strokeSize" class="label"></div>