diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-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/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"/> |