From eafdeea98f4a2df18182e6ce91e80f242c61210b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 18 Oct 2015 20:06:49 +0100
Subject: [PATCH] Cleaned mce edit bar and image options

---
 resources/assets/js/pages/page-form.js | 4 ++--
 resources/assets/sass/_pages.scss      | 5 +++++
 resources/assets/sass/_tinymce.scss    | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index a31220479..e926a24fb 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -14,14 +14,14 @@ module.exports = {
     extended_valid_elements: 'pre[*]',
     automatic_uploads: false,
     valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
-    plugins: "image table textcolor paste link imagetools fullscreen code hr",
+    plugins: "image table textcolor paste link fullscreen imagetools code hr",
+    imagetools_toolbar: 'imageoptions',
     toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
     content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
     style_formats: [
         {title: "Header 1", format: "h1"},
         {title: "Header 2", format: "h2"},
         {title: "Header 3", format: "h3"},
-        {title: "Header 4", format: "h4"},
         {title: "Paragraph", format: "p"},
         {title: "Blockquote", format: "blockquote"},
         {title: "Code Block", icon: "code", format: "pre"},
diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 9eee9c1b8..1536f71ca 100644
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -17,6 +17,7 @@
 
 .page-content {
   max-width: 840px;
+  overflow-wrap: break-word;
   .align-left {
     float: left !important;
     text-align: left;
@@ -37,6 +38,10 @@
   h1, h2, h3, h4, h5, h6 {
     clear: both;
   }
+  hr {
+    clear: both;
+    margin: $-m 0;
+  }
 }
 
 // Page content pointers
diff --git a/resources/assets/sass/_tinymce.scss b/resources/assets/sass/_tinymce.scss
index 44fb44c56..547f62128 100644
--- a/resources/assets/sass/_tinymce.scss
+++ b/resources/assets/sass/_tinymce.scss
@@ -30,7 +30,12 @@
     background-color: #FFF;
   }
 }
-.mce-tinymce.mce-container.mce-panel {
+
+.mce-container-body.mce-flow-layout {
+  text-align: center;
+}
+
+.edit-area.flex > .mce-tinymce.mce-container.mce-panel {
   height: 100%;
   max-height: 100%;
   flex: 1;