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/text-properties.reel/text-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/text-properties.reel/text-properties.html')
| -rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index e7fafd0d..f47ca0c8 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
| @@ -290,7 +290,7 @@ | |||
| 290 | <button data-montage-id="fontSettings" style="display: none"></button> | 290 | <button data-montage-id="fontSettings" style="display: none"></button> |
| 291 | <label class="label">Size:</label> | 291 | <label class="label">Size:</label> |
| 292 | <select data-montage-id="fontSize" class="nj-skinned"></select> | 292 | <select data-montage-id="fontSize" class="nj-skinned"></select> |
| 293 | <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> | 293 | <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div> |
| 294 | <div class="btnGroup toolOptionsFloatChildren"> | 294 | <div class="btnGroup toolOptionsFloatChildren"> |
| 295 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> | 295 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> |
| 296 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> | 296 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> |