diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index f269cae82dd..a1347bc2633 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -1,47 +1,16 @@
-.sidemenu-canvas {
- position: relative;
-}
.sidemenu-wrapper {
- position: absolute;
- top: 52px;
- left: 0;
- //border-top: 1px solid $tight-form-border;
+ display: flex;
+ flex-direction: column;
width: $side-menu-width;
background-color: $side-menu-bg;
- z-index: 1000;
- opacity: 0;
- visibility: hidden;
+ z-index: 1;
a:focus {
text-decoration: none;
}
}
-.sidemenu-open {
- .sidemenu-wrapper {
- visibility: visible;
- //transform: translate3d(0, 0, 0);
- opacity: 1;
- transition: opacity 0.3s;
- }
-}
-
-.sidemenu-pinned {
- .sidemenu-wrapper {
- min-height: calc(100% - 54px);
- }
- .dashboard-container {
- padding-left: $side-menu-width + 8px;
- }
- .page-container {
- margin-left: $side-menu-width;
- }
- .search-container {
- left: $side-menu-width;
- }
-}
-
.sidemenu {
list-style: none;
margin: 0;
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 5702a1aa260..33a62e8fbc5 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -1,16 +1,18 @@
.grafana-app {
- display: block;
height: 100%;
+ display: flex;
+ align-items: stretch;
+ width: 100%;
}
.main-view {
- // height: 100%; REMOVED FOR FOOTER TRW
+ flex-grow: 1;
}
.page-container {
+ @extend .container;
background-color: $page-bg;
padding: ($spacer * 2) ($spacer * 4);
- max-width: 1060px;
min-height: calc(100% - 54px);
padding-bottom: $spacer * 5;
background-image: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%)
diff --git a/public/views/index.html b/public/views/index.html
index b3c504740da..411481b2149 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -25,9 +25,7 @@
-
+
-
-
-
+
+
-
-
-
-
-
-
+
- [[if .GoogleTagManagerId]]
-
-
-
-
-
- [[end]]
+
+
+
+
+
+
-
+ [[if .GoogleTagManagerId]]
+
+
+
+
+
+ [[end]]
+
+
-
-