From 918f11d81ee0ee684dc6f3f376c41d5468667639 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Tue, 26 Sep 2023 17:51:26 +0200 Subject: [PATCH] Revert "Dashboard: Reduce scope of `contain: strict` to TextPanel (#75466) Revert "Dashboard: Reduce scope of `contain: strict` to TextPanel (#75329)" This reverts commit ade0de5ae9277f17bf4977bf2e350f9a4e4da224. --- .../grafana-ui/src/components/PanelChrome/PanelChrome.tsx | 1 + public/app/plugins/panel/text/TextPanel.tsx | 5 +---- public/sass/pages/_dashboard.scss | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx index f7e9b09289f..90da9adfd77 100644 --- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx +++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx @@ -403,6 +403,7 @@ const getStyles = (theme: GrafanaTheme2) => { content: css({ label: 'panel-content', flexGrow: 1, + contain: 'strict', }), headerContainer: css({ label: 'panel-header', diff --git a/public/app/plugins/panel/text/TextPanel.tsx b/public/app/plugins/panel/text/TextPanel.tsx index d831532f48a..3252c3fb718 100644 --- a/public/app/plugins/panel/text/TextPanel.tsx +++ b/public/app/plugins/panel/text/TextPanel.tsx @@ -51,7 +51,7 @@ export function TextPanel(props: Props) { } return ( - + ({ height: 100%; ` ), - containStrict: css({ - contain: 'strict', - }), }); diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index e46ab1d0108..77c985f4435 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -46,6 +46,7 @@ padding: $panel-padding; width: 100%; flex-grow: 1; + contain: strict; height: calc(100% - #{$panel-header-height}); &--no-padding {