Merge branch 'master' into valuepanel

This commit is contained in:
Torkel Ödegaard
2014-10-23 13:35:54 +02:00
14 changed files with 57 additions and 30 deletions
+5 -3
View File
@@ -116,7 +116,7 @@
position: fixed;
left: 0px;
right: 0px;
top: 54px;
top: 51px;
height: 100%;
padding: 0 10px;
background: @grafanaPanelBackground;
@@ -134,9 +134,11 @@
.dashboard-fullscreen {
.main-view-container {
height: 0;
overflow: hidden;
padding: 0;
height: 0;
.row-control-inner {
display: none;
}
}
}
+1 -1
View File
@@ -1,6 +1,6 @@
.submenu-controls-visible:not(.hide-controls) {
.panel-fullscreen {
top: 91px;
top: 88px;
}
}