aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/text-properties.reel/text-properties.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html38
1 files changed, 18 insertions, 20 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 23de2bca..8839ae94 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -26,8 +26,6 @@
26 "btnItalic": {"@": "btnItalic"}, 26 "btnItalic": {"@": "btnItalic"},
27 "btnUnderline": {"@": "btnUnderline"}, 27 "btnUnderline": {"@": "btnUnderline"},
28 "btnStrikethrough": {"@": "btnStrikethrough"}, 28 "btnStrikethrough": {"@": "btnStrikethrough"},
29 "txtLink": {"@": "txtLink"},
30 "linkTarget": {"@": "linkTarget"},
31 "alignLeft": {"@": "alignLeft"}, 29 "alignLeft": {"@": "alignLeft"},
32 "alignCenter": {"@": "alignCenter"}, 30 "alignCenter": {"@": "alignCenter"},
33 "alignRight": {"@": "alignRight"}, 31 "alignRight": {"@": "alignRight"},
@@ -296,36 +294,36 @@
296 </head> 294 </head>
297 295
298 <body> 296 <body>
299 <div id="textProperties" class="subToolHolderPanel optionsTextTool"> 297 <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool">
300 <label class="label" style="display: none">Class:</label> 298 <label class="label" style="display: none">Class:</label>
301 <input id="className" style="display: none" /> 299 <input data-montage-id="className" style="display: none" />
302 <label class="label" style="display: none">Tag:</label> 300 <label class="label" style="display: none">Tag:</label>
303 <select id="tagType" style="display: none"></select> 301 <select data-montage-id="tagType" style="display: none"></select>
304 <label class="label">Font:</label> 302 <label class="label">Font:</label>
305 <select id="fontSelection" class="nj-skinned fontSelection"></select> 303 <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select>
306 <button id="fontSettings" style="display: none"></button> 304 <button data-montage-id="fontSettings" style="display: none"></button>
307 <label class="label">Size:</label> 305 <label class="label">Size:</label>
308 <select id="fontSize" class="nj-skinned"></select> 306 <select data-montage-id="fontSize" class="nj-skinned"></select>
309 <div data-montage-id="fontColorCtrl" class="fontColor"></div> 307 <div data-montage-id="fontColorCtrl" class="fontColor"></div>
310 <div class="btnGroup"> 308 <div class="btnGroup">
311 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> 309 <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> 310 <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> 311 <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> 312 <button data-montage-id="btnStrikethrough" class="btnStriketrough nj-skinned" style="text-decoration: line-through;"></button>
315 </div> 313 </div>
316 <div class="btnGroup"> 314 <div class="btnGroup">
317 <button id="alignLeft" class="nj-skinned"></button> 315 <button data-montage-id="alignLeft" class="nj-skinned"></button>
318 <button id="alignCenter" class="nj-skinned"></button> 316 <button data-montage-id="alignCenter" class="nj-skinned"></button>
319 <button id="alignRight" class="nj-skinned"></button> 317 <button data-montage-id="alignRight" class="nj-skinned"></button>
320 <button id="alignJustify" class="nj-skinned"></button> 318 <button data-montage-id="alignJustify" class="nj-skinned"></button>
321 </div> 319 </div>
322 <div class="btnGroup"> 320 <div class="btnGroup">
323 <button id="indent" class="nj-skinned"></button> 321 <button data-montage-id="indent" class="nj-skinned"></button>
324 <button id="outdent" class="nj-skinned"></button> 322 <button data-montage-id="outdent" class="nj-skinned"></button>
325 </div> 323 </div>
326 <div class="btnGroup"> 324 <div class="btnGroup">
327 <button id="bulletedList" class="nj-skinned"></button> 325 <button data-montage-id="bulletedList" class="nj-skinned"></button>
328 <button id="numberedList" class="nj-skinned"></button> 326 <button data-montage-id="numberedList" class="nj-skinned"></button>
329 </div> 327 </div>
330 </div> 328 </div>
331 </body> 329 </body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 16:44:24 +0000