From 87ba1b67b7b282db26ae7a15cdc611df8589b867 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Mon, 2 Nov 2020 16:52:41 +0100
Subject: [PATCH] Dashboard: fix view panel mode for Safari / iOS (#28702)

* fix(dashboard): flex-basis so child height percentages are respected

* fix(dashboard): reset scrollTop when entering view panel mode
---
 public/app/features/dashboard/containers/DashboardPage.tsx | 1 +
 public/sass/pages/_dashboard.scss                          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index 8003db0a715..f7bd7a0c62f 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -145,6 +145,7 @@ export class DashboardPage extends PureComponent<Props, State> {
         this.setState({
           viewPanel: panel,
           rememberScrollTop: this.state.scrollTop,
+          updateScrollTop: 0,
         });
       });
     }
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 63f86625bf9..46751b2c735 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -18,6 +18,7 @@
 
 .dashboard-content {
   padding: $dashboard-padding;
+  flex-basis: 100%;
   flex-grow: 1;
 }