IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tidy up styles + fix docked menu overlaying popovers (#91380)

Browse Source
This commit is contained in:
Ashley Harrison
2024-08-01 14:16:45 +02:00
committed by GitHub
parent aa6e9379bf
commit 7a9a34629b
1 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
public/app/core/components/AppChrome/AppChrome.tsx
View File

@@ -141,28 +141,23 @@ const getStyles = (theme: GrafanaTheme2, searchBarHidden: boolean) => {
paddingTop: 0,
}),
dockedMegaMenu: css(
{
background: theme.colors.background.primary,
borderRight: `1px solid ${theme.colors.border.weak}`,
display: 'none',
[theme.breakpoints.up('xl')]: {
display: 'block',
},
},
config.featureToggles.bodyScrolling
? {
background: theme.colors.background.primary,
borderRight: `1px solid ${theme.colors.border.weak}`,
display: 'none',
position: 'fixed',
height: `calc(100% - ${searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2}px)`,
zIndex: theme.zIndex.navbarFixed,
[theme.breakpoints.up('xl')]: {
display: 'block',
},
zIndex: 1,
}
: {
background: theme.colors.background.primary,
borderRight: `1px solid ${theme.colors.border.weak}`,
display: 'none',
zIndex: theme.zIndex.navbarFixed,
[theme.breakpoints.up('xl')]: {
display: 'block',
},
}
),
topNav: css({
@@ -175,54 +170,44 @@ const getStyles = (theme: GrafanaTheme2, searchBarHidden: boolean) => {
flexDirection: 'column',
}),
panes: css(
config.featureToggles.bodyScrolling
? {
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
label: 'page-panes',
}
: {
label: 'page-panes',
display: 'flex',
height: '100%',
width: '100%',
flexGrow: 1,
minHeight: 0,
flexDirection: 'column',
[theme.breakpoints.up('md')]: {
flexDirection: 'row',
},
}
{
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
label: 'page-panes',
},
!config.featureToggles.bodyScrolling && {
height: '100%',
minHeight: 0,
width: '100%',
[theme.breakpoints.up('md')]: {
flexDirection: 'row',
},
}
),
pageContainerMenuDocked: css({
paddingLeft: '300px',
}),
pageContainer: css(
config.featureToggles.bodyScrolling
? {
label: 'page-container',
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
}
: {
label: 'page-container',
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
minHeight: 0,
minWidth: 0,
overflow: 'auto',
'@media print': {
overflow: 'visible',
},
'@page': {
margin: 0,
size: 'auto',
padding: 0,
},
}
{
label: 'page-container',
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
},
!config.featureToggles.bodyScrolling && {
minHeight: 0,
minWidth: 0,
overflow: 'auto',
'@media print': {
overflow: 'visible',
},
'@page': {
margin: 0,
size: 'auto',
padding: 0,
},
}
),
skipLink: css({
position: 'fixed',