Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode

No scroll in autofitpanel-mode

Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode
No scroll in autofitpanel-mode
646ca90b · Marcus Efraimsson · GitHub · a6056ba5 · cc40a515 · 646ca90b
Commit 646ca90b authored Mar 04, 2019 by Marcus Efraimsson Committed by GitHub Mar 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

public/app/features/dashboard/state/DashboardModel.ts
+2 -2

No files found.
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -887,8 +887,8 @@ export class DashboardModel {
    }

    // add back navbar height
-    if (kioskMode === KIOSK_MODE_TV) {
-      visibleHeight += 55;
+    if (kioskMode && kioskMode !== KIOSK_MODE_TV) {
+      visibleHeight += navbarHeight;
    }

    const visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN));