diff --git a/resources/assets/js/components/wysiwyg-editor.js b/resources/assets/js/components/wysiwyg-editor.js index 39bce4959..c70d82719 100644 --- 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 8cc7c830f..ab16e7fab 100755 --- 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 5d3aafa10..1e5a4231c 100644 --- a/resources/views/comments/comments.blade.php +++ b/resources/views/comments/comments.blade.php @@ -1,3 +1,4 @@ +{{--TODO--}}
{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index e818e996e..3dbb5d3bb 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -13,8 +13,8 @@ @if(!isset($isDraft)) @endif - @include('pages/form', ['model' => $page]) - @include('pages/form-toolbox') + @include('pages.form', ['model' => $page]) + @include('pages.form-toolbox')