Index: api/src/main/styling/styles/_rich_text.scss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- api/src/main/styling/styles/_rich_text.scss	(revision 57521)
+++ api/src/main/styling/styles/_rich_text.scss	(revision )
@@ -1,4 +1,4 @@
-// Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+// Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 .hippo-richtext {
 
-  line-height: normal;
+  line-height: 1.6em;
 
   a {
     text-decoration: underline;
@@ -77,7 +77,7 @@
   h4:first-child,
   h5:first-child,
   h6:first-child,
-  p {
+  p:first-child {
     margin-top: 0;
   }
 
Index: richtext/ckeditor/plugins/src/main/resources/ckeditor/hippocontents.css
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- richtext/ckeditor/plugins/src/main/resources/ckeditor/hippocontents.css	(revision 57521)
+++ richtext/ckeditor/plugins/src/main/resources/ckeditor/hippocontents.css	(revision )
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2013-2016 Hippo B.V. (http://www.onehippo.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,7 +145,7 @@
 .cke_wysiwyg_div.cke_editable h4:first-child,
 .cke_wysiwyg_div.cke_editable h5:first-child,
 .cke_wysiwyg_div.cke_editable h6:first-child,
-.cke_wysiwyg_div.cke_editable p {
+.cke_wysiwyg_div.cke_editable p:first-child {
     margin-top: 0;
 }
 
Index: api/src/main/styling/styles/_editor.scss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- api/src/main/styling/styles/_editor.scss	(revision 57521)
+++ api/src/main/styling/styles/_editor.scss	(revision )
@@ -1,4 +1,4 @@
-// Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+// Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -130,7 +130,7 @@
   }
 
   .hippo-editor-field-textarea {
-    line-height: normal;
+    line-height: 1.6em;
   }
 
   .linefill {
Index: api/src/main/styling/styles/_editor_preview.scss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- api/src/main/styling/styles/_editor_preview.scss	(revision 57521)
+++ api/src/main/styling/styles/_editor_preview.scss	(revision )
@@ -1,4 +1,4 @@
-// Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+// Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
     }
 
     .hippo-editor-field-textarea {
-      line-height: normal;
+      line-height: 1.6em;
     }
   }