Merge branch 'master' into t/ckeditor5/488

src/headingediting.js

@@ -9,8 +9,6 @@
 
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import { elementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/two-way-converters';
-
 import HeadingCommand from './headingcommand';
 
 const defaultModelElement = 'paragraph';
@@ -61,11 +59,7 @@ export default class HeadingEditing extends Plugin {
 					inheritAllFrom: '$block'
 				} );
 
-				elementToElement( editor.conversion, {
-					model: option.model,
-					view: option.view,
-					upcastAlso: option.upcastAlso
-				} );
+				editor.conversion.elementToElement( option );
 
 				// Register the heading command for this option.
 				editor.commands.add( option.model, new HeadingCommand( editor, option.model ) );

tests/headingediting.js

@@ -89,7 +89,8 @@ describe( 'HeadingEditing', () => {
 								upcastAlso: [
 									{ name: 'p', attribute: { 'data-heading': 'h1' } }
 								],
-								title: 'User H1'
+								title: 'User H1',
+								priority: 'high'
 							}
 						]
 					}

theme/heading.css

@@ -15,13 +15,6 @@
 	font-size: 14px;
 }
 
-/* Using absolute units to make sure each element has the same height and padding.
-https://github.com/ckeditor/ckeditor5-heading/issues/63 */
-[class*="ck-heading_"] {
-	line-height: 18px;
-	padding: 11px;
-}
-
 [class*="ck-heading_heading"] {
 	font-weight: bold;
 }