diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx index 6aa4c368886..cbd0d387d6e 100644 --- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx +++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx @@ -234,7 +234,7 @@ const getStyles = (theme: GrafanaTheme2) => { backgroundColor: background, border: `1px solid ${borderColor}`, position: 'relative', - borderRadius: '3px', + borderRadius: theme.shape.borderRadius(1), height: '100%', display: 'flex', flexDirection: 'column', diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx index e221db268b7..0368161babe 100644 --- a/public/app/core/components/PageNew/Page.tsx +++ b/public/app/core/components/PageNew/Page.tsx @@ -99,10 +99,6 @@ Page.OldNavOnly = function OldNavOnly() { }; const getStyles = (theme: GrafanaTheme2) => { - const shadow = theme.isDark - ? `0 0.6px 1.5px -1px rgb(0 0 0),0 2px 4px -1px rgb(0 0 0 / 40%),0 5px 10px -1px rgb(0 0 0 / 23%)` - : '0 0.6px 1.5px -1px rgb(0 0 0 / 8%),0 2px 4px rgb(0 0 0 / 6%),0 5px 10px -1px rgb(0 0 0 / 5%)'; - return { wrapper: css({ label: 'page-wrapper', @@ -135,7 +131,8 @@ const getStyles = (theme: GrafanaTheme2) => { pageInner: css({ label: 'page-inner', padding: theme.spacing(2), - boxShadow: shadow, + borderRadius: theme.shape.borderRadius(1), + border: `1px solid ${theme.colors.border.weak}`, background: theme.colors.background.primary, display: 'flex', flexDirection: 'column', diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index b80b7465fa0..77c985f4435 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -11,7 +11,7 @@ background-color: $panel-bg; border: $panel-border; position: relative; - border-radius: 3px; + border-radius: 2px; height: 100%; width: 100%; display: flex;