Merge branch 't/11379'

CHANGES.md

@@ -22,6 +22,7 @@ CKEditor 4 Changelog
 * [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method which allows to block upcasting given element to a widget.
 * [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as plain text conflict with the [MooTools](http://mootools.net) library.
 * [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
+* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents' `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
 
 
 ## CKEditor 4.3.1

contents.css

@@ -21,7 +21,7 @@ body
 .cke_editable
 {
 	font-size: 13px;
-	line-height: 1.6em;
+	line-height: 1.6;
 }
 
 blockquote
@@ -64,7 +64,7 @@ ol,ul,dl
 h1,h2,h3,h4,h5,h6
 {
 	font-weight: normal;
-	line-height: 1.2em;
+	line-height: 1.2;
 }
 
 hr

samples/inlineall.html

@@ -103,14 +103,14 @@
 		{
 			font-family: "Arial Black",arial-black;
 			font-size: 4.6em;
-			line-height: 1.1em;
+			line-height: 1.1;
 			text-transform: uppercase;
 		}
 
 		#headerLeft h3
 		{
 			font-size: 2.3em;
-			line-height: 1.1em;
+			line-height: 1.1;
 			margin: .2em 0 0;
 			color: #666;
 		}
@@ -123,7 +123,7 @@
 
 		#headerRight p
 		{
-			line-height: 1.8em;
+			line-height: 1.8;
 			text-align: justify;
 			margin: 0;
 		}

samples/sample.css

@@ -5,7 +5,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 
 html, body, h1, h2, h3, h4, h5, h6, div, span, blockquote, p, address, form, fieldset, img, ul, ol, dl, dt, dd, li, hr, table, td, th, strong, em, sup, sub, dfn, ins, del, q, cite, var, samp, code, kbd, tt, pre
 {
-	line-height: 1.5em;
+	line-height: 1.5;
 }
 
 body