aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/text-properties.reel/text-properties.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html39
1 files changed, 18 insertions, 21 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 03786d76..7fbec1da 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -21,13 +21,10 @@
21 "fontSelection": {"@": "fontSelection"}, 21 "fontSelection": {"@": "fontSelection"},
22 "fontSettings": {"@": "fontSettings"}, 22 "fontSettings": {"@": "fontSettings"},
23 "fontSize": {"@": "fontSize"}, 23 "fontSize": {"@": "fontSize"},
24 "fontColor": {"@": "fontColor"},
25 "btnBold": {"@": "btnBold"}, 24 "btnBold": {"@": "btnBold"},
26 "btnItalic": {"@": "btnItalic"}, 25 "btnItalic": {"@": "btnItalic"},
27 "btnUnderline": {"@": "btnUnderline"}, 26 "btnUnderline": {"@": "btnUnderline"},
28 "btnStrikethrough": {"@": "btnStrikethrough"}, 27 "btnStrikethrough": {"@": "btnStrikethrough"},
29 "txtLink": {"@": "txtLink"},
30 "linkTarget": {"@": "linkTarget"},
31 "alignLeft": {"@": "alignLeft"}, 28 "alignLeft": {"@": "alignLeft"},
32 "alignCenter": {"@": "alignCenter"}, 29 "alignCenter": {"@": "alignCenter"},
33 "alignRight": {"@": "alignRight"}, 30 "alignRight": {"@": "alignRight"},
@@ -296,36 +293,36 @@
296 </head> 293 </head>
297 294
298 <body> 295 <body>
299 <div id="textProperties" class="subToolHolderPanel optionsTextTool"> 296 <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool">
300 <label class="label" style="display: none">Class:</label> 297 <label class="label" style="display: none">Class:</label>
301 <input id="className" style="display: none" /> 298 <input data-montage-id="className" style="display: none" />
302 <label class="label" style="display: none">Tag:</label> 299 <label class="label" style="display: none">Tag:</label>
303 <select id="tagType" style="display: none"></select> 300 <select data-montage-id="tagType" style="display: none"></select>
304 <label class="label">Font:</label> 301 <label class="label">Font:</label>
305 <select id="fontSelection" class="nj-skinned fontSelection"></select> 302 <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select>
306 <button id="fontSettings" style="display: none"></button> 303 <button data-montage-id="fontSettings" style="display: none"></button>
307 <label class="label">Size:</label> 304 <label class="label">Size:</label>
308 <select id="fontSize" class="nj-skinned"></select> 305 <select data-montage-id="fontSize" class="nj-skinned"></select>
309 <div class="fontColor"></div> 306 <div class="fontColor"></div>
310 <div class="btnGroup"> 307 <div class="btnGroup">
311 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> 308 <button data-montage-id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button>
312 <button id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button> 309 <button data-montage-id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button>
313 <button id="btnUnderline" class="btnUnderline nj-skinned" style="text-decoration: underline;"></button> 310 <button data-montage-id="btnUnderline" class="btnUnderline nj-skinned" style="text-decoration: underline;"></button>
314 <button id="btnStrikethrough" class="btnStriketrough nj-skinned" style="text-decoration: line-through;"></button> 311 <button data-montage-id="btnStrikethrough" class="btnStriketrough nj-skinned" style="text-decoration: line-through;"></button>
315 </div> 312 </div>
316 <div class="btnGroup"> 313 <div class="btnGroup">
317 <button id="alignLeft" class="nj-skinned"></button> 314 <button data-montage-id="alignLeft" class="nj-skinned"></button>
318 <button id="alignCenter" class="nj-skinned"></button> 315 <button data-montage-id="alignCenter" class="nj-skinned"></button>
319 <button id="alignRight" class="nj-skinned"></button> 316 <button data-montage-id="alignRight" class="nj-skinned"></button>
320 <button id="alignJustify" class="nj-skinned"></button> 317 <button data-montage-id="alignJustify" class="nj-skinned"></button>
321 </div> 318 </div>
322 <div class="btnGroup"> 319 <div class="btnGroup">
323 <button id="indent" class="nj-skinned"></button> 320 <button data-montage-id="indent" class="nj-skinned"></button>
324 <button id="outdent" class="nj-skinned"></button> 321 <button data-montage-id="outdent" class="nj-skinned"></button>
325 </div> 322 </div>
326 <div class="btnGroup"> 323 <div class="btnGroup">
327 <button id="bulletedList" class="nj-skinned"></button> 324 <button data-montage-id="bulletedList" class="nj-skinned"></button>
328 <button id="numberedList" class="nj-skinned"></button> 325 <button data-montage-id="numberedList" class="nj-skinned"></button>
329 </div> 326 </div>
330 </div> 327 </div>
331 </body> 328 </body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:25:30 +0000