diff options
| author | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
| commit | d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch) | |
| tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/components/tools-properties/text-properties.reel/text-properties.html | |
| parent | bf6bed611714053aabc0d38978bddd62873d04aa (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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> |