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/ink-bottle-properties.reel/ink-bottle-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/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 579930f0..c7fcc523 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
@@ -151,7 +151,7 @@ | |||
151 | 151 | ||
152 | <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/> | 152 | <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/> |
153 | <div class="toolColorChipIcon PencilTool"></div> | 153 | <div class="toolColorChipIcon PencilTool"></div> |
154 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | 154 | <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div> |
155 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 155 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
156 | 156 | ||
157 | <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> | 157 | <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> |