Commit 8bd3d106 by Alexander Zobnin Committed by Torkel Ödegaard

Fix dashboard menu overlapping (#10044)

* dashboard menu: fix overlap by singlestat and panel link icon

* refactor: navbar z-index

* hide grafana icon in solo panel mode
parent 68580f06
...@@ -201,6 +201,10 @@ $zindex-tooltip: 1020; ...@@ -201,6 +201,10 @@ $zindex-tooltip: 1020;
$zindex-navbar-fixed: 1030; $zindex-navbar-fixed: 1030;
$zindex-modal-backdrop: 1040; $zindex-modal-backdrop: 1040;
$zindex-modal: 1050; $zindex-modal: 1050;
$zindex-typeahead: 1060;
$zindex-sidemenu : $zindex-navbar-fixed + 5;
// Buttons // Buttons
// //
......
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
// Typeahead // Typeahead
// --------- // ---------
.typeahead { .typeahead {
z-index: 1051; z-index: $zindex-typeahead;
margin-top: 2px; // give it some space to breathe margin-top: 2px; // give it some space to breathe
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
position: relative; position: relative;
padding-left: $side-menu-width; padding-left: $side-menu-width;
box-shadow: $navbarShadow; box-shadow: $navbarShadow;
z-index: 1; z-index: $zindex-navbar-fixed;
background: $navbarBackground; background: $navbarBackground;
} }
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
flex-direction: column; flex-direction: column;
width: $side-menu-width; width: $side-menu-width;
background: $navbarBackground; background: $navbarBackground;
z-index: 10; z-index: $zindex-sidemenu;
a:focus { a:focus {
text-decoration: none; text-decoration: none;
} }
...@@ -19,7 +18,7 @@ ...@@ -19,7 +18,7 @@
height: auto; height: auto;
box-shadow: $side-menu-shadow; box-shadow: $side-menu-shadow;
position: relative; position: relative;
z-index: 2; z-index: $zindex-sidemenu;
} }
.sidemenu__top, .sidemenu__top,
.sidemenu__bottom { .sidemenu__bottom {
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
// again by the mouse getting outside the hover space // again by the mouse getting outside the hover space
left: $side-menu-width - 2px; left: $side-menu-width - 2px;
@include animation('dropdown-anim 150ms ease-in-out 100ms forwards'); @include animation('dropdown-anim 150ms ease-in-out 100ms forwards');
z-index: 1; z-index: $zindex-sidemenu;
} }
} }
} }
......
...@@ -19,6 +19,7 @@ div.flot-text { ...@@ -19,6 +19,7 @@ div.flot-text {
&--solo { &--solo {
.panel-container { .panel-container {
border: none; border: none;
z-index: $zindex-sidemenu + 1
} }
} }
} }
...@@ -144,14 +145,14 @@ div.flot-text { ...@@ -144,14 +145,14 @@ div.flot-text {
width: 27px; width: 27px;
height: 27px; height: 27px;
top: 0; top: 0;
z-index: 10; z-index: 1;
.fa { .fa {
position: relative; position: relative;
top: -4px; top: -4px;
left: -6px; left: -6px;
font-size: 75%; font-size: 75%;
z-index: 1000; z-index: 1;
} }
&--info { &--info {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment