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/brush-properties.reel/brush-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/brush-properties.reel/brush-properties.html')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 7d99a42a..8753e921 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | <body> | 82 | <body> |
| 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> | 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> |
| 84 | <div class="toolColorChipIcon FillTool"></div> | 84 | <div class="toolColorChipIcon FillTool"></div> |
| 85 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 85 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 86 | <div class="nj-divider divider-vertical"> </div> | 86 | <div class="nj-divider divider-vertical"> </div> |
| 87 | <label class="label"> Width:</label> | 87 | <label class="label"> Width:</label> |
| 88 | <div data-montage-id="strokeSize" class="label"></div> | 88 | <div data-montage-id="strokeSize" class="label"></div> |