X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e7dcc2dcdf9e709523705a2b9ea9ffb7dedda59b..refs/pull/5721/head:/resources/views/comments/comments.blade.php

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 882cfdf45..a5f0168a5 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -3,7 +3,6 @@
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
          option:page-comments:count-text="{{ trans('entities.comment_thread_count') }}"
          option:page-comments:archived-count-text="{{ trans('entities.comment_archived_count') }}"
-         option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
          class="comments-list tab-container"
          aria-label="{{ trans('entities.comments') }}">
@@ -24,19 +23,20 @@
                     aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
         </div>
         @if ($commentTree->empty() && userCan('comment-create-all'))
-            <div class="ml-m" refs="page-comments@add-button-container">
+            <div refs="page-comments@add-button-container" class="ml-m flex-container-row" >
                 <button type="button"
                         refs="page-comments@add-comment-button"
-                        class="button outline mb-m">{{ trans('entities.comment_add') }}</button>
+                        class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>
             </div>
         @endif
     </div>
 
     <div id="comment-tab-panel-active"
+         refs="page-comments@active-container"
          tabindex="0"
          role="tabpanel"
          aria-labelledby="comment-tab-active"
-         class="comment-container">
+         class="comment-container no-outline">
         <div refs="page-comments@comment-container">
             @foreach($commentTree->getActive() as $branch)
                 @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
@@ -48,10 +48,10 @@
         @if(userCan('comment-create-all'))
             @include('comments.create')
             @if (!$commentTree->empty())
-                <div refs="page-comments@addButtonContainer" class="flex-container-row">
+                <div refs="page-comments@addButtonContainer" class="ml-m flex-container-row">
                     <button type="button"
                             refs="page-comments@add-comment-button"
-                            class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
+                            class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>
                 </div>
             @endif
         @endif
@@ -63,7 +63,7 @@
          role="tabpanel"
          aria-labelledby="comment-tab-archived"
          hidden="hidden"
-         class="comment-container">
+         class="comment-container no-outline">
         @foreach($commentTree->getArchived() as $branch)
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
@@ -72,7 +72,6 @@
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
         @push('body-end')
-            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
             @include('form.editor-translations')
             @include('entities.selector-popup')
         @endpush