diff --git a/packages/block-library/src/table/deprecated.js b/packages/block-library/src/table/deprecated.js new file mode 100644 index 00000000000000..79fc5726ea23fb --- /dev/null +++ b/packages/block-library/src/table/deprecated.js @@ -0,0 +1,81 @@ +/** + * External dependencies + */ +import classnames from 'classnames'; + +/** + * WordPress dependencies + */ +import { RichText, getColorClassName } from '@wordpress/block-editor'; + +/** + * Internal dependencies + */ +import metadata from './block.json'; + +const supports = { + align: true, +}; + +const deprecated = [ + { + attributes: metadata.attributes, + supports, + save( { attributes } ) { + const { + hasFixedLayout, + head, + body, + foot, + backgroundColor, + } = attributes; + const isEmpty = ! head.length && ! body.length && ! foot.length; + + if ( isEmpty ) { + return null; + } + + const backgroundClass = getColorClassName( 'background-color', backgroundColor ); + + const classes = classnames( backgroundClass, { + 'has-fixed-layout': hasFixedLayout, + 'has-background': !! backgroundClass, + } ); + + const Section = ( { type, rows } ) => { + if ( ! rows.length ) { + return null; + } + + const Tag = `t${ type }`; + + return ( + + { rows.map( ( { cells }, rowIndex ) => ( + + { cells.map( ( { content, tag, scope }, cellIndex ) => + + ) } + + ) ) } + + ); + }; + + return ( + +
+
+
+
+ ); + }, + }, +]; + +export default deprecated; diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js index 38a7c02e54a81f..90a4682e2223ad 100644 --- a/packages/block-library/src/table/edit.js +++ b/packages/block-library/src/table/edit.js @@ -451,7 +451,7 @@ export class TableEdit extends Component { ); } - const classes = classnames( className, backgroundColor.class, { + const tableClasses = classnames( backgroundColor.class, { 'has-fixed-layout': hasFixedLayout, 'has-background': !! backgroundColor.color, } ); @@ -499,11 +499,13 @@ export class TableEdit extends Component { ] } /> - -
-
-
-
+
+ +
+
+
+
+
); } diff --git a/packages/block-library/src/table/editor.scss b/packages/block-library/src/table/editor.scss index 46ae863c31a0d9..73df244f815ff8 100644 --- a/packages/block-library/src/table/editor.scss +++ b/packages/block-library/src/table/editor.scss @@ -2,10 +2,17 @@ &[data-align="left"], &[data-align="right"], &[data-align="center"] { + // Stop table block from collapsing when tables are floated. + height: auto; + table { // Ensure the table element is not full-width when aligned. width: auto; } + td, + th { + word-break: break-all; + } } &[data-align="center"] { @@ -19,9 +26,11 @@ .wp-block-table { + // Remove default
style. + margin: 0; + table { border-collapse: collapse; - width: 100%; } td, diff --git a/packages/block-library/src/table/index.js b/packages/block-library/src/table/index.js index b5172841a876da..b8bd0893e87ec8 100644 --- a/packages/block-library/src/table/index.js +++ b/packages/block-library/src/table/index.js @@ -6,6 +6,7 @@ import { __, _x } from '@wordpress/i18n'; /** * Internal dependencies */ +import deprecated from './deprecated'; import edit from './edit'; import icon from './icon'; import metadata from './block.json'; @@ -30,4 +31,5 @@ export const settings = { transforms, edit, save, + deprecated, }; diff --git a/packages/block-library/src/table/save.js b/packages/block-library/src/table/save.js index 14ac51ff299b7b..086a0221c045b5 100644 --- a/packages/block-library/src/table/save.js +++ b/packages/block-library/src/table/save.js @@ -55,10 +55,12 @@ export default function save( { attributes } ) { }; return ( - -
-
-
-
+
+ +
+
+
+
+
); } diff --git a/packages/block-library/src/table/style.scss b/packages/block-library/src/table/style.scss index b79d044fac2b35..13e9f048059890 100644 --- a/packages/block-library/src/table/style.scss +++ b/packages/block-library/src/table/style.scss @@ -4,10 +4,21 @@ $subtle-pale-blue: #e7f5fe; $subtle-pale-pink: #fcf0ef; + overflow-x: auto; + + table { + width: 100%; + } + // Fixed layout toggle - &.has-fixed-layout { + .has-fixed-layout { table-layout: fixed; width: 100%; + + td, + th { + word-break: break-all; + } } &.alignleft, @@ -17,25 +28,30 @@ // The table element needs to be kept as display table // for table features to work reliably. display: table; - // Table cannot be 100% width if it is aligned, so set // width as auto. width: auto; + + td, + th { + // Aligned tables shouldn't scroll horizontally so we need their contents to wrap. + word-break: break-all; + } } - &.has-subtle-light-gray-background-color { + .has-subtle-light-gray-background-color { background-color: $subtle-light-gray; } - &.has-subtle-pale-green-background-color { + .has-subtle-pale-green-background-color { background-color: $subtle-pale-green; } - &.has-subtle-pale-blue-background-color { + .has-subtle-pale-blue-background-color { background-color: $subtle-pale-blue; } - &.has-subtle-pale-pink-background-color { + .has-subtle-pale-pink-background-color { background-color: $subtle-pale-pink; } diff --git a/packages/block-library/src/table/theme.scss b/packages/block-library/src/table/theme.scss index 7f604ba661f29c..664a4f57cf53dd 100644 --- a/packages/block-library/src/table/theme.scss +++ b/packages/block-library/src/table/theme.scss @@ -1,12 +1,10 @@ .wp-block-table { - width: 100%; - min-width: $break-mobile / 2; border-collapse: collapse; td, th { padding: 0.5em; border: 1px solid; - word-break: break-all; + word-break: normal; } } diff --git a/packages/e2e-tests/fixtures/blocks/core__table.html b/packages/e2e-tests/fixtures/blocks/core__table.html index b9b41659e835aa..7cc12a4efb3b5b 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table.html +++ b/packages/e2e-tests/fixtures/blocks/core__table.html @@ -1,3 +1,3 @@ -
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
diff --git a/packages/e2e-tests/fixtures/blocks/core__table.json b/packages/e2e-tests/fixtures/blocks/core__table.json index 7d71d09c53be82..3318420a516b30 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table.json +++ b/packages/e2e-tests/fixtures/blocks/core__table.json @@ -140,6 +140,6 @@ "foot": [] }, "innerBlocks": [], - "originalContent": "
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
" + "originalContent": "
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__table.parsed.json b/packages/e2e-tests/fixtures/blocks/core__table.parsed.json index 5462dae3908a8c..591b028b25b567 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__table.parsed.json @@ -3,9 +3,9 @@ "blockName": "core/table", "attrs": {}, "innerBlocks": [], - "innerHTML": "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n", + "innerHTML": "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n", "innerContent": [ - "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n" + "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__table.serialized.html b/packages/e2e-tests/fixtures/blocks/core__table.serialized.html index a791eb149f6273..346cd673c17514 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__table.serialized.html @@ -1,3 +1,3 @@ -
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
diff --git a/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.html b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.html new file mode 100644 index 00000000000000..b9b41659e835aa --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.html @@ -0,0 +1,3 @@ + +
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+ diff --git a/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.json b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.json new file mode 100644 index 00000000000000..7d71d09c53be82 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.json @@ -0,0 +1,145 @@ +[ + { + "clientId": "_clientId_0", + "name": "core/table", + "isValid": true, + "attributes": { + "hasFixedLayout": false, + "head": [ + { + "cells": [ + { + "content": "Version", + "tag": "th" + }, + { + "content": "Musician", + "tag": "th" + }, + { + "content": "Date", + "tag": "th" + } + ] + } + ], + "body": [ + { + "cells": [ + { + "content": ".70", + "tag": "td" + }, + { + "content": "No musician chosen.", + "tag": "td" + }, + { + "content": "May 27, 2003", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "1.0", + "tag": "td" + }, + { + "content": "Miles Davis", + "tag": "td" + }, + { + "content": "January 3, 2004", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "Lots of versions skipped, see the full list", + "tag": "td" + }, + { + "content": "…", + "tag": "td" + }, + { + "content": "…", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "4.4", + "tag": "td" + }, + { + "content": "Clifford Brown", + "tag": "td" + }, + { + "content": "December 8, 2015", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "4.5", + "tag": "td" + }, + { + "content": "Coleman Hawkins", + "tag": "td" + }, + { + "content": "April 12, 2016", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "4.6", + "tag": "td" + }, + { + "content": "Pepper Adams", + "tag": "td" + }, + { + "content": "August 16, 2016", + "tag": "td" + } + ] + }, + { + "cells": [ + { + "content": "4.7", + "tag": "td" + }, + { + "content": "Sarah Vaughan", + "tag": "td" + }, + { + "content": "December 6, 2016", + "tag": "td" + } + ] + } + ], + "foot": [] + }, + "innerBlocks": [], + "originalContent": "
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
" + } +] diff --git a/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.parsed.json b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.parsed.json new file mode 100644 index 00000000000000..5462dae3908a8c --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.parsed.json @@ -0,0 +1,20 @@ +[ + { + "blockName": "core/table", + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n", + "innerContent": [ + "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n" + ] + }, + { + "blockName": null, + "attrs": {}, + "innerBlocks": [], + "innerHTML": "\n", + "innerContent": [ + "\n" + ] + } +] diff --git a/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.serialized.html b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.serialized.html new file mode 100644 index 00000000000000..346cd673c17514 --- /dev/null +++ b/packages/e2e-tests/fixtures/blocks/core__table__deprecated-1.serialized.html @@ -0,0 +1,3 @@ + +
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+ diff --git a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.html b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.html index 4a5175c4c07d41..dfe5cdd5c26168 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.html +++ b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.html @@ -1,3 +1,3 @@ -
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
diff --git a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.json b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.json index 96e101aa0264c9..23bb732aebff2f 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.json +++ b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.json @@ -143,6 +143,6 @@ "foot": [] }, "innerBlocks": [], - "originalContent": "
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
" + "originalContent": "
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
" } ] diff --git a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.parsed.json b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.parsed.json index e8410b63327af8..052a8a0a3d049c 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.parsed.json +++ b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.parsed.json @@ -3,9 +3,9 @@ "blockName": "core/table", "attrs": {}, "innerBlocks": [], - "innerHTML": "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n", + "innerHTML": "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n", "innerContent": [ - "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n" + "\n
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
\n" ] }, { diff --git a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.serialized.html b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.serialized.html index 4a5175c4c07d41..88122c62ed9683 100644 --- a/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.serialized.html +++ b/packages/e2e-tests/fixtures/blocks/core__table__scope-attribute.serialized.html @@ -1,3 +1,3 @@ -
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
+
VersionMusicianDate
.70No musician chosen.May 27, 2003
1.0Miles DavisJanuary 3, 2004
Lots of versions skipped, see the full list……
4.4Clifford BrownDecember 8, 2015
4.5Coleman HawkinsApril 12, 2016
4.6Pepper AdamsAugust 16, 2016
4.7Sarah VaughanDecember 6, 2016
diff --git a/packages/e2e-tests/specs/blocks/__snapshots__/table.test.js.snap b/packages/e2e-tests/specs/blocks/__snapshots__/table.test.js.snap index abafd184d19109..f2c4ee232d0785 100644 --- a/packages/e2e-tests/specs/blocks/__snapshots__/table.test.js.snap +++ b/packages/e2e-tests/specs/blocks/__snapshots__/table.test.js.snap @@ -2,36 +2,36 @@ exports[`Table allows adding and deleting columns across the table header, body and footer 1`] = ` " -
+
" `; exports[`Table allows adding and deleting columns across the table header, body and footer 2`] = ` " -
+
" `; exports[`Table allows header and footer rows to be switched on and off 1`] = ` " -
header
body
footer
+
header
body
footer
" `; exports[`Table allows header and footer rows to be switched on and off 2`] = ` " -
body
+
body
" `; exports[`Table allows text to by typed into cells 1`] = ` " -
Thisis
tableblock
+
Thisis
tableblock
" `; exports[`Table displays a form for choosing the row and column count of the table 1`] = ` " -
+
" `; diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss index a94783dab8f727..05ea111d6ab82c 100644 --- a/packages/edit-post/src/components/header/style.scss +++ b/packages/edit-post/src/components/header/style.scss @@ -1,4 +1,5 @@ .edit-post-header { + height: $header-height; padding: $grid-size-small 2px; border-bottom: $border-width solid $light-gray-500; background: $white; diff --git a/test/integration/fixtures/apple-out.html b/test/integration/fixtures/apple-out.html index 530bf8d34140c2..40d4f1a8d133ed 100644 --- a/test/integration/fixtures/apple-out.html +++ b/test/integration/fixtures/apple-out.html @@ -19,7 +19,7 @@ -
+
One Two @@ -37,7 +37,7 @@ II III -
+
diff --git a/test/integration/fixtures/evernote-out.html b/test/integration/fixtures/evernote-out.html index 4d8c6c43b9c99e..c984df312f0bef 100644 --- a/test/integration/fixtures/evernote-out.html +++ b/test/integration/fixtures/evernote-out.html @@ -17,13 +17,13 @@ -
One +
One Two Three
Four Five Six -
+
diff --git a/test/integration/fixtures/google-docs-out.html b/test/integration/fixtures/google-docs-out.html index 7733ca660bdd02..576b2cd7fda73f 100644 --- a/test/integration/fixtures/google-docs-out.html +++ b/test/integration/fixtures/google-docs-out.html @@ -19,7 +19,7 @@

This is a heading

-
OneTwoThree
123
IIIIII
+
OneTwoThree
123
IIIIII
diff --git a/test/integration/fixtures/google-docs-table-out.html b/test/integration/fixtures/google-docs-table-out.html index 697c2d41ea5cd9..fbca760d25258b 100644 --- a/test/integration/fixtures/google-docs-table-out.html +++ b/test/integration/fixtures/google-docs-table-out.html @@ -1,3 +1,3 @@ -
OneTwoThree
123
IIIIII
+
OneTwoThree
123
IIIIII
diff --git a/test/integration/fixtures/google-docs-table-with-comments-out.html b/test/integration/fixtures/google-docs-table-with-comments-out.html index 697c2d41ea5cd9..fbca760d25258b 100644 --- a/test/integration/fixtures/google-docs-table-with-comments-out.html +++ b/test/integration/fixtures/google-docs-table-with-comments-out.html @@ -1,3 +1,3 @@ -
OneTwoThree
123
IIIIII
+
OneTwoThree
123
IIIIII
diff --git a/test/integration/fixtures/google-docs-with-comments-out.html b/test/integration/fixtures/google-docs-with-comments-out.html index 7733ca660bdd02..576b2cd7fda73f 100644 --- a/test/integration/fixtures/google-docs-with-comments-out.html +++ b/test/integration/fixtures/google-docs-with-comments-out.html @@ -19,7 +19,7 @@

This is a heading

-
OneTwoThree
123
IIIIII
+
OneTwoThree
123
IIIIII
diff --git a/test/integration/fixtures/markdown-out.html b/test/integration/fixtures/markdown-out.html index ba9a33b7172cc2..85a105b640923b 100644 --- a/test/integration/fixtures/markdown-out.html +++ b/test/integration/fixtures/markdown-out.html @@ -28,11 +28,11 @@

Table

-
First HeaderSecond Header
Content from cell 1Content from cell 2
Content in the first columnContent in the second column
+
First HeaderSecond Header
Content from cell 1Content from cell 2
Content in the first columnContent in the second column
-
Table with empty cells.
+
Table with empty cells.
diff --git a/test/integration/fixtures/ms-word-online-out.html b/test/integration/fixtures/ms-word-online-out.html index 3088b7480877f7..798881e8c0151b 100644 --- a/test/integration/fixtures/ms-word-online-out.html +++ b/test/integration/fixtures/ms-word-online-out.html @@ -15,7 +15,7 @@ -
One Two Three 
1 2 3 
I II III 
+
One Two Three 
1 2 3 
I II III 
diff --git a/test/integration/fixtures/ms-word-out.html b/test/integration/fixtures/ms-word-out.html index c53c5aaeba2e97..427e12686ad625 100644 --- a/test/integration/fixtures/ms-word-out.html +++ b/test/integration/fixtures/ms-word-out.html @@ -29,7 +29,7 @@

This is a heading level 2

-
+
One Two @@ -47,7 +47,7 @@

This is a heading level 2

II 		III -
+