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/tag-properties.reel/tag-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/tag-properties.reel/tag-properties.html')
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index 87f87aff..082384db 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 48 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 49 | 49 | ||
| 50 | <div class="toolColorChipIcon FillTool"></div> | 50 | <div class="toolColorChipIcon FillTool"></div> |
| 51 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 51 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 52 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 52 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 53 | 53 | ||
| 54 | <div id="classNameContainer"> | 54 | <div id="classNameContainer"> |