diff options
author | Jose Antonio Marquez | 2012-06-21 16:54:13 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-21 16:54:13 -0700 |
commit | 8d0c07b6734d874b481bb4866466de8f863a67a7 (patch) | |
tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
parent | d9f2064fc7dc5284e159032e3efbab5de9b2dc14 (diff) | |
parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
download | ninja-8d0c07b6734d874b481bb4866466de8f863a67a7.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel/pen-properties.html')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 4 |
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"> </div> | 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 57 | <div class="nj-divider divider-vertical"> </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> |