Skip to content
Permalink
Browse files

Merge branch 't/16810' into major

  • Loading branch information...
Tade0 committed Jan 23, 2017
2 parents d69e345 + a202610 commit 85631f3f3670488c325c1c87fae7cd0928ef930e
Showing with 1,268 additions and 245 deletions.
  1. +1 −0 CHANGES.md
  2. +0 −1 plugins/pastefromword/filter/default.js
  3. +13 −4 plugins/tabletools/plugin.js
  4. +40 −1 tests/plugins/pastefromword/generated/_fixtures/Simple_table/expected.html
  5. +76 −1 tests/plugins/pastefromword/generated/_fixtures/Simple_table/word2007/expected_ie8.html
  6. +94 −1 tests/plugins/pastefromword/generated/_fixtures/Simple_table/word2013/expected_ie11.html
  7. BIN .../plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/Table_vertical_alignment.docx
  8. +64 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/expected.html
  9. +98 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/chrome.html
  10. +62 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/edge.html
  11. +168 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/expected_ie11.html
  12. +100 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/firefox.html
  13. +63 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2007/ie11.html
  14. +96 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2013/chrome.html
  15. +96 −0 tests/plugins/pastefromword/generated/_fixtures/Table_vertical_alignment/word2013/firefox.html
  16. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10285test/expected.html
  17. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10285test/word2013/expected_ie11.html
  18. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10285test/word2013/expected_ie8.html
  19. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10783list-break2/expected.html
  20. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10783list-break2/word2013/expected_ie11.html
  21. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/10783list-break2/word2013/expected_ie8.html
  22. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11237borderBug/expected.html
  23. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11237borderBug/word2013/expected_ie11.html
  24. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11237borderBug/word2013/expected_ie8.html
  25. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11477Table_in_word/expected.html
  26. +1 −1 .../plugins/pastefromword/generated/_fixtures/Tickets/11477Table_in_word/word2013/expected_ie11.html
  27. +1 −1 ...s/plugins/pastefromword/generated/_fixtures/Tickets/11477Table_in_word/word2013/expected_ie8.html
  28. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11529Table_OO/expected.html
  29. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11529Table_OO/word2013/expected_ie11.html
  30. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11529Table_OO/word2013/expected_ie8.html
  31. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11950Test_Table/expected.html
  32. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11950Test_Table/word2013/expected_ie11.html
  33. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/11950Test_Table/word2013/expected_ie8.html
  34. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/12406Doc1/expected.html
  35. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/12406Doc1/word2013/expected_ie11.html
  36. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/12406Doc1/word2013/expected_ie8.html
  37. +1 −1 .../plugins/pastefromword/generated/_fixtures/Tickets/12406Document1_(3)/word2013/expected_ie11.html
  38. +4 −4 tests/plugins/pastefromword/generated/_fixtures/Tickets/3039blog_test_2003_(2)/expected.html
  39. +4 −4 ...gins/pastefromword/generated/_fixtures/Tickets/3039blog_test_2003_(2)/word2013/expected_ie11.html
  40. +4 −4 ...ugins/pastefromword/generated/_fixtures/Tickets/3039blog_test_2003_(2)/word2013/expected_ie8.html
  41. +155 −155 tests/plugins/pastefromword/generated/_fixtures/Tickets/3959Test_doc_with_date/expected.html
  42. +1 −1 ...gins/pastefromword/generated/_fixtures/Tickets/3959Test_doc_with_date/word2013/expected_ie11.html
  43. +1 −1 ...ugins/pastefromword/generated/_fixtures/Tickets/3959Test_doc_with_date/word2013/expected_ie8.html
  44. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/3959Test_doc_without_date/expected.html
  45. +1 −1 ...s/pastefromword/generated/_fixtures/Tickets/3959Test_doc_without_date/word2013/expected_ie11.html
  46. +1 −1 ...ns/pastefromword/generated/_fixtures/Tickets/3959Test_doc_without_date/word2013/expected_ie8.html
  47. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6449Sample/expected.html
  48. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6449Sample/word2013/expected_ie11.html
  49. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6449Sample/word2013/expected_ie8.html
  50. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6594/expected.html
  51. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6594/word2013/expected_ie11.html
  52. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6594/word2013/expected_ie8.html
  53. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6595/expected.html
  54. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6595/word2013/expected_ie11.html
  55. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/6595/word2013/expected_ie8.html
  56. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/682tester/expected.html
  57. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/682tester/word2013/expected_ie11.html
  58. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/682tester/word2013/expected_ie8.html
  59. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7521simple_table/expected.html
  60. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7521simple_table/word2013/expected_ie11.html
  61. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7521simple_table/word2013/expected_ie8.html
  62. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7696empty_table/expected.html
  63. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7696empty_table/word2013/expected_ie11.html
  64. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/7696empty_table/word2013/expected_ie8.html
  65. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/8780ckeditor_tablebug_document/expected.html
  66. +1 −1 ...tefromword/generated/_fixtures/Tickets/8780ckeditor_tablebug_document/word2013/expected_ie11.html
  67. +1 −1 ...stefromword/generated/_fixtures/Tickets/8780ckeditor_tablebug_document/word2013/expected_ie8.html
  68. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9340test_ckeditor/expected.html
  69. +1 −1 ...s/plugins/pastefromword/generated/_fixtures/Tickets/9340test_ckeditor/word2013/expected_ie11.html
  70. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9340test_ckeditor/word2013/expected_ie8.html
  71. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475List2010/expected.html
  72. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475List2010/word2013/expected_ie11.html
  73. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475List2010/word2013/expected_ie8.html
  74. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475list2003/expected.html
  75. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475list2003/word2013/expected_ie11.html
  76. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9475list2003/word2013/expected_ie8.html
  77. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9616word_table/expected.html
  78. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9616word_table/word2013/expected_ie11.html
  79. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9616word_table/word2013/expected_ie8.html
  80. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9685ckeditor_tablebug_document/expected.html
  81. +1 −1 ...tefromword/generated/_fixtures/Tickets/9685ckeditor_tablebug_document/word2013/expected_ie11.html
  82. +1 −1 ...stefromword/generated/_fixtures/Tickets/9685ckeditor_tablebug_document/word2013/expected_ie8.html
  83. +1 −1 tests/plugins/pastefromword/generated/_fixtures/Tickets/9685testResumeTest/expected.html
  84. +1 −1 .../plugins/pastefromword/generated/_fixtures/Tickets/9685testResumeTest/word2013/expected_ie11.html
  85. +1 −1 ...s/plugins/pastefromword/generated/_fixtures/Tickets/9685testResumeTest/word2013/expected_ie8.html
  86. +2 −1 tests/plugins/pastefromword/generated/_helpers/pfwTools.js
  87. +2 −1 tests/plugins/pastefromword/generated/generic.js
  88. +1 −1 tests/plugins/pastefromword/generated/tickets3.js
  89. +1 −1 tests/plugins/pastefromword/generated/tickets4.js
  90. +40 −0 tests/plugins/tabletools/tabletools.html
  91. +18 −0 tests/plugins/tabletools/tabletools.js
@@ -17,6 +17,7 @@ New Features:

Fixed Issues:

* [#16810](http://dev.ckeditor.com/ticket/16810): Fixed: Vertical align in tables not supported by [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
@@ -309,7 +309,6 @@
'cellspacing': remove,
'cellpadding': remove,
'border': remove,
'valign': remove,
'v:shapes': remove,
'o:spid': remove
},
@@ -662,17 +662,26 @@
addCmd( 'cellProperties', new CKEDITOR.dialogCommand( 'cellProperties', createDef( {
allowedContent: 'td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]',
requiredContent: 'table',
contentTransformations: [
[ {
contentTransformations: [ [ {
element: 'td',
left: function( element ) {
return element.styles.background && element.styles.background.match( /^(#[a-fA-F0-9]{3,6}|rgb\([\d, ]+\)|\w+)$/ );
},
right: function( element ) {
element.styles[ 'background-color' ] = element.styles.background;
}
} ]
]
}, {
element: 'td',
check: 'td{vertical-align}',
left: function( element ) {
return element.attributes && element.attributes.valign;
},
right: function( element ) {
element.styles[ 'vertical-align' ] = element.attributes.valign;
delete element.attributes.valign;
}
}
] ]
} ) ) );
CKEDITOR.dialog.add( 'cellProperties', this.path + 'dialogs/tableCell.js' );

@@ -1 +1,40 @@
<table border="1" cellspacing="0"><tbody><tr><td style="width:155.8pt"><p>x\y</p></td><td style="width:155.85pt"><p>1</p></td><td style="width:155.85pt"><p>2</p></td></tr><tr><td style="width:155.8pt"><p>1</p></td><td style="width:155.85pt"><p>1,1</p></td><td style="width:155.85pt"><p>1,2</p></td></tr><tr><td style="width:155.8pt"><p>2</p></td><td style="width:155.85pt"><p>2,1</p></td><td style="width:155.85pt"><p>2,2</p></td></tr></tbody></table><p><br /></p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p>x\y</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>1</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>2</p>
</td>
</tr>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p>1</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>1,1</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>1,2</p>
</td>
</tr>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p>2</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>2,1</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p>2,2</p>
</td>
</tr>
</tbody>
</table>
<p>
<br />
</p>
@@ -1 +1,76 @@
<table border="1" cellspacing="0"><tbody><tr><td style="width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">x\y</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">1</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">2</span></span></p></td></tr><tr><td style="width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">1</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">1,1</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">1,2</span></span></p></td></tr><tr><td style="width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">2</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">2,1</span></span></p></td><td style="width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="font-size:medium"><span style="color:#000000">2,2</span></span></p></td></tr></tbody></table><p style="margin-left:0in; margin-right:0in"><br /></p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">x\y</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">1</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">2</span>
</span>
</p>
</td>
</tr>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">1</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">1,1</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">1,2</span>
</span>
</p>
</td>
</tr>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">2</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">2,1</span>
</span>
</p>
</td>
<td style="width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="font-size:medium">
<span style="color:#000000">2,2</span>
</span>
</p>
</td>
</tr>
</tbody>
</table>
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
@@ -1 +1,94 @@
<table border="1" cellspacing="0"><tbody><tr><td style="width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">x\y</span></span></span></p></td><td style="border-color:windowtext windowtext windowtext rgb(0, 0, 0); width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">1</span></span></span></p></td><td style="border-color:windowtext windowtext windowtext rgb(0, 0, 0); width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">2</span></span></span></p></td></tr><tr><td style="border-color:rgb(0, 0, 0) windowtext windowtext; width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">1</span></span></span></p></td><td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">1,1</span></span></span></p></td><td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">1,2</span></span></span></p></td></tr><tr><td style="border-color:rgb(0, 0, 0) windowtext windowtext; width:155.8pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">2</span></span></span></p></td><td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">2,1</span></span></span></p></td><td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt"><p style="margin-left:0in; margin-right:0in"><span style="color:#000000"><span style="font-family:calibri"><span style="font-size:medium">2,2</span></span></span></p></td></tr></tbody></table><p style="margin-left:0in; margin-right:0in"><br /></p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">x\y</span>
</span>
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext rgb(0, 0, 0); width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">1</span>
</span>
</span>
</p>
</td>
<td style="border-color:windowtext windowtext windowtext rgb(0, 0, 0); width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">2</span>
</span>
</span>
</p>
</td>
</tr>
<tr>
<td style="border-color:rgb(0, 0, 0) windowtext windowtext; width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">1</span>
</span>
</span>
</p>
</td>
<td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">1,1</span>
</span>
</span>
</p>
</td>
<td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">1,2</span>
</span>
</span>
</p>
</td>
</tr>
<tr>
<td style="border-color:rgb(0, 0, 0) windowtext windowtext; width:155.8pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">2</span>
</span>
</span>
</p>
</td>
<td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">2,1</span>
</span>
</span>
</p>
</td>
<td style="border-color:#000000 windowtext windowtext #000000; width:155.85pt" valign="top" valign="top" valign="top" valign="top">
<p style="margin-left:0in; margin-right:0in">
<span style="color:#000000">
<span style="font-family:calibri">
<span style="font-size:medium">2,2</span>
</span>
</span>
</p>
</td>
</tr>
</tbody>
</table>
<p style="margin-left:0in; margin-right:0in">
<br />
</p>
@@ -0,0 +1,64 @@
<p>no vertical align:</p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
</td>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
</td>
</tr>
</tbody>
</table>
<p>
<br />
</p>
<p>vertical align top:</p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
</td>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
</td>
</tr>
</tbody>
</table>
<p>
<br />
</p>
<p>vertical align bottom:</p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt" valign="bottom">
<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
</td>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
</td>
</tr>
</tbody>
</table>
<p>
<br />
</p>
<p>vertical align middle:</p>
<table border="1" cellspacing="0">
<tbody>
<tr>
<td style="width:233.75pt">
<p><span style="line-height:normal"><span style="height:49.0pt">foo</span></span></p>
</td>
<td style="width:233.75pt" valign="top">
<p><span style="line-height:normal"><span style="height:49.0pt">bar</span></span></p>
</td>
</tr>
</tbody>
</table>
<p>
<br />
</p>
Oops, something went wrong.

0 comments on commit 85631f3

Please sign in to comment.
You can’t perform that action at this time.