From 99ffc4ef549ba039426e62822c3ec1603d0c3800 Mon Sep 17 00:00:00 2001 From: alicedraillard <85180705+alicedraillard@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:52:38 +0100 Subject: [PATCH] fix(freeLayout): #MAG-304 fix free layout card-list size (#169) --- .../public/sass/global/components/containers/_board.scss | 4 ++++ src/main/resources/public/template/board.html | 2 +- .../public/ts/controllers/board-view.controller.ts | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/resources/public/sass/global/components/containers/_board.scss b/src/main/resources/public/sass/global/components/containers/_board.scss index 875478c6..6f0a296a 100644 --- a/src/main/resources/public/sass/global/components/containers/_board.scss +++ b/src/main/resources/public/sass/global/components/containers/_board.scss @@ -134,6 +134,10 @@ width: 60px; } + .cardListMinHeight { + min-height: 1000px; + } + &-list { width: 100%; overflow-x: auto; diff --git a/src/main/resources/public/template/board.html b/src/main/resources/public/template/board.html index 7759ff89..270ae79f 100644 --- a/src/main/resources/public/template/board.html +++ b/src/main/resources/public/template/board.html @@ -80,7 +80,7 @@

-
+
diff --git a/src/main/resources/public/ts/controllers/board-view.controller.ts b/src/main/resources/public/ts/controllers/board-view.controller.ts index 1329a4f9..5da1ea94 100644 --- a/src/main/resources/public/ts/controllers/board-view.controller.ts +++ b/src/main/resources/public/ts/controllers/board-view.controller.ts @@ -101,6 +101,8 @@ interface IViewModel extends ng.IController { resetBoardView(): Promise; + notEmptyAndLayoutFree(): boolean; + onScroll(): void; resetCards(): void; @@ -367,6 +369,10 @@ class Controller implements IViewModel { safeApply(this.$scope); } + notEmptyAndLayoutFree(): boolean { + return this.cards.length > 0 && this.board.isLayoutFree(); + } + initDraggable = (): void => { const that = this; this.draggable = {