Merge branch 'master' into simon/remove-included-in-block

2023-02-20 17:28:05 +09:00
parent e5c6fef694 feee38f356
commit 23e7de9b86
5 changed files with 12 additions and 9 deletions
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -123,8 +123,10 @@
      (pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false">
    </ngb-pagination>

-    <div class="clearfix"></div>
-    <br>
+    <ng-template [ngIf]="!widget">
+      <div class="clearfix"></div>
+      <br>
+    </ng-template>
  </div>
  
 </div>
--- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
+++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
@@ -103,6 +103,5 @@
  </div>

  <br>
-</div>

-<br>
+</div>