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/text-properties.reel/text-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/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 a353752f..8899ff3c 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
| @@ -285,7 +285,7 @@ | |||
| 285 | <button data-montage-id="fontSettings" style="display: none"></button> | 285 | <button data-montage-id="fontSettings" style="display: none"></button> |
| 286 | <label class="label">Size:</label> | 286 | <label class="label">Size:</label> |
| 287 | <select data-montage-id="fontSize" class="nj-skinned"></select> | 287 | <select data-montage-id="fontSize" class="nj-skinned"></select> |
| 288 | <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> | 288 | <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div> |
| 289 | <div class="btnGroup toolOptionsFloatChildren"> | 289 | <div class="btnGroup toolOptionsFloatChildren"> |
| 290 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> | 290 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> |
| 291 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> | 291 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> |