mirror of https://github.com/grafana/grafana.git
				
				
				
			Dashboard: Revert descending z-index changes (#83466)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
This commit is contained in:
		
							parent
							
								
									316601258a
								
							
						
					
					
						commit
						1dc6014b10
					
				|  | @ -358,15 +358,6 @@ const getStyles = (theme: GrafanaTheme2) => { | ||||||
|       display: 'flex', |       display: 'flex', | ||||||
|       flexDirection: 'column', |       flexDirection: 'column', | ||||||
| 
 | 
 | ||||||
|       '> *': { |  | ||||||
|         zIndex: 0, |  | ||||||
|       }, |  | ||||||
| 
 |  | ||||||
|       // matches .react-grid-item styles in _dashboard_grid.scss to ensure any contained tooltips occlude adjacent panels
 |  | ||||||
|       '&:hover, &:active, &:focus': { |  | ||||||
|         zIndex: theme.zIndex.activePanel, |  | ||||||
|       }, |  | ||||||
| 
 |  | ||||||
|       '.show-on-hover': { |       '.show-on-hover': { | ||||||
|         opacity: '0', |         opacity: '0', | ||||||
|         visibility: 'hidden', |         visibility: 'hidden', | ||||||
|  |  | ||||||
|  | @ -161,7 +161,6 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www | ||||||
| // -------------------------
 | // -------------------------
 | ||||||
| // Used for a bird's eye view of components dependent on the z-axis
 | // Used for a bird's eye view of components dependent on the z-axis
 | ||||||
| // Try to avoid customizing these :)
 | // Try to avoid customizing these :)
 | ||||||
| $zindex-active-panel: ${theme.zIndex.activePanel}; |  | ||||||
| $zindex-dropdown: ${theme.zIndex.dropdown}; | $zindex-dropdown: ${theme.zIndex.dropdown}; | ||||||
| $zindex-navbar-fixed: ${theme.zIndex.navbarFixed}; | $zindex-navbar-fixed: ${theme.zIndex.navbarFixed}; | ||||||
| $zindex-sidemenu: ${theme.zIndex.sidemenu}; | $zindex-sidemenu: ${theme.zIndex.sidemenu}; | ||||||
|  |  | ||||||
|  | @ -91,7 +91,6 @@ export class SplitPaneWrapper extends PureComponent<React.PropsWithChildren<Prop | ||||||
| 
 | 
 | ||||||
|     return ( |     return ( | ||||||
|       <SplitPane |       <SplitPane | ||||||
|         className={styles.splitPane} |  | ||||||
|         split={splitOrientation} |         split={splitOrientation} | ||||||
|         minSize={minSize} |         minSize={minSize} | ||||||
|         maxSize={maxSize} |         maxSize={maxSize} | ||||||
|  | @ -115,9 +114,6 @@ export class SplitPaneWrapper extends PureComponent<React.PropsWithChildren<Prop | ||||||
| 
 | 
 | ||||||
| const getStyles = (theme: GrafanaTheme2, hasSplit: boolean) => { | const getStyles = (theme: GrafanaTheme2, hasSplit: boolean) => { | ||||||
|   return { |   return { | ||||||
|     splitPane: css({ |  | ||||||
|       overflow: 'visible !important', |  | ||||||
|     }), |  | ||||||
|     resizer: css({ |     resizer: css({ | ||||||
|       display: hasSplit ? 'block' : 'none', |       display: hasSplit ? 'block' : 'none', | ||||||
|     }), |     }), | ||||||
|  |  | ||||||
|  | @ -74,7 +74,7 @@ function getStyles(theme: GrafanaTheme2) { | ||||||
|       position: 'sticky', |       position: 'sticky', | ||||||
|       top: 0, |       top: 0, | ||||||
|       background: theme.colors.background.canvas, |       background: theme.colors.background.canvas, | ||||||
|       zIndex: theme.zIndex.activePanel, |       zIndex: theme.zIndex.navbarFixed, | ||||||
|       padding: theme.spacing(2, 0), |       padding: theme.spacing(2, 0), | ||||||
|       width: '100%', |       width: '100%', | ||||||
|       marginLeft: 'auto', |       marginLeft: 'auto', | ||||||
|  |  | ||||||
|  | @ -245,7 +245,7 @@ function getStyles(theme: GrafanaTheme2) { | ||||||
|       flexWrap: 'wrap', |       flexWrap: 'wrap', | ||||||
|       position: 'sticky', |       position: 'sticky', | ||||||
|       background: theme.isDark ? theme.colors.background.canvas : theme.colors.background.primary, |       background: theme.isDark ? theme.colors.background.canvas : theme.colors.background.primary, | ||||||
|       zIndex: theme.zIndex.activePanel + 1, |       zIndex: theme.zIndex.navbarFixed, | ||||||
|       top: 0, |       top: 0, | ||||||
|     }), |     }), | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|  | @ -163,7 +163,6 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www | ||||||
| // ------------------------- | // ------------------------- | ||||||
| // Used for a bird's eye view of components dependent on the z-axis | // Used for a bird's eye view of components dependent on the z-axis | ||||||
| // Try to avoid customizing these :) | // Try to avoid customizing these :) | ||||||
| $zindex-active-panel: 999; |  | ||||||
| $zindex-dropdown: 1030; | $zindex-dropdown: 1030; | ||||||
| $zindex-navbar-fixed: 1000; | $zindex-navbar-fixed: 1000; | ||||||
| $zindex-sidemenu: 1020; | $zindex-sidemenu: 1020; | ||||||
|  |  | ||||||
|  | @ -13,7 +13,6 @@ | ||||||
|   &:hover { |   &:hover { | ||||||
|     .react-resizable-handle { |     .react-resizable-handle { | ||||||
|       visibility: visible; |       visibility: visible; | ||||||
|       z-index: $zindex-active-panel; |  | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | @ -86,22 +85,11 @@ | ||||||
|   } |   } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Hack to prevent panel overlap during drag/hover (due to descending z-index assignment) |  | ||||||
| .react-grid-item:not(.context-menu-open, .resizing) { |  | ||||||
|   &:hover, |  | ||||||
|   &:active, |  | ||||||
|   &:focus { |  | ||||||
|     z-index: $zindex-active-panel !important; |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // Hack for preventing panel menu overlapping. | // Hack for preventing panel menu overlapping. | ||||||
| .react-grid-item.context-menu-open, |  | ||||||
| .react-grid-item.resizing, |  | ||||||
| .react-grid-item.resizing.panel, | .react-grid-item.resizing.panel, | ||||||
| .react-grid-item.panel.dropdown-menu-open, | .react-grid-item.panel.dropdown-menu-open, | ||||||
| .react-grid-item.react-draggable-dragging.panel { | .react-grid-item.react-draggable-dragging.panel { | ||||||
|   z-index: $zindex-dropdown !important; |   z-index: $zindex-dropdown; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Disable animation on initial rendering and enable it when component has been mounted. | // Disable animation on initial rendering and enable it when component has been mounted. | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue