Merge branch 'master' into nymkappa/bugfix/block-url-link

2022-05-31 18:20:47 +09:00
parent 6b22efa969 f815c0aa72
commit a9b059bf69
48 changed files with 3438 additions and 3254 deletions
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -2,6 +2,7 @@

 <div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget, 'legacy': !indexingAvailable}">
  <h1 *ngIf="!widget" class="float-left" i18n="master-page.blocks">Blocks</h1>
+  <div *ngIf="!widget && isLoading" class="spinner-border ml-3" role="status"></div>

  <div class="clearfix"></div>