Fixed page edit to have white background

diff --git a/resources/assets/js/components/wysiwyg-editor.js b/resources/assets/js/components/wysiwyg-editor.js
index 39bce49591e490a90559c8f8e34a95d6aafe66f5..c70d8271986156c30c2366a2c902a42431076d3d 100644 (file)
--- a/resources/assets/js/components/wysiwyg-editor.js
+++ b/resources/assets/js/components/wysiwyg-editor.js
@@ -419,7 +419,7 @@ class WysiwygEditor {
             plugins: this.plugins,
             imagetools_toolbar: 'imageoptions',
             toolbar: this.getToolBar(),
-            content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
+            content_style: "html, body {background: #FFF;} body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
             style_formats: [
                 {title: "Header Large", format: "h2"},
                 {title: "Header Medium", format: "h3"},

diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 8cc7c830f453c84b1c6e0e9a2ca3e9528b5df165..ab16e7fabd0ac797489410b36a590bfa50fb73f1 100755 (executable)
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -3,6 +3,7 @@
   flex-direction: column;
   align-items: stretch;
   overflow: hidden;
+  background-color: #FFF;
   .faded-small {
     height: auto;
   }

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 5d3aafa1005244eda4706bf644f4f306b8ed2101..1e5a4231cb98b83fa34accbc5af5eb65d59b2eed 100644 (file)
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,3 +1,4 @@
+{{--TODO--}}
 <div page-comments page-id="{{ $page->id }}" class="comments-list">
   <h5 comments-title class="float left">{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
 

diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index e818e996ec7e8d40d8765baffa1cf0d75e3b78f7..3dbb5d3bbae84e3560c1816e287db48e52a67b69 100644 (file)
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -13,8 +13,8 @@
             @if(!isset($isDraft))
                 <input type="hidden" name="_method" value="PUT">
             @endif
-            @include('pages/form', ['model' => $page])
-            @include('pages/form-toolbox')
+            @include('pages.form', ['model' => $page])
+            @include('pages.form-toolbox')
         </form>
     </div>