TypeScript: Updated compile target, addressed issues

[bookstack] / resources / views / comments / comments.blade.php

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 51c08d69a851f8c80238eeb324fc9ebfacfc72ae..a5f0168a5c8a95a5f4db3b695992703712928e91 100644 (file)
--- 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: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') }}">
          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
          class="comments-list tab-container"
          aria-label="{{ trans('entities.comments') }}">


@@ -24,15 +23,16 @@
                     aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
         </div>
         @if ($commentTree->empty() && userCan('comment-create-all'))
                     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"
                 <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"
             </div>
         @endif
     </div>
 
     <div id="comment-tab-panel-active"

+         refs="page-comments@active-container"

          tabindex="0"
          role="tabpanel"
          aria-labelledby="comment-tab-active"
          tabindex="0"
          role="tabpanel"
          aria-labelledby="comment-tab-active"


@@ -48,10 +48,10 @@
         @if(userCan('comment-create-all'))
             @include('comments.create')
             @if (!$commentTree->empty())
         @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"
                     <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
                 </div>
             @endif
         @endif


@@ -72,7 +72,6 @@
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
         @push('body-end')
 
     @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
             @include('form.editor-translations')
             @include('entities.selector-popup')
         @endpush