diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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"/> |