Merge branch 'master' of github.com:torkelo/grafana-private into pro

This commit is contained in:
Torkel Ödegaard
2014-11-20 09:16:49 +01:00
26 changed files with 207 additions and 80 deletions
+9
View File
@@ -575,3 +575,12 @@ a:hover {
// MEDIA QUERIES
// -----------------------------------------------------
.caret {
color: @textColor
}
.dropdown-submenu > a:after {
border-left-color: @textColor;
}
-24
View File
@@ -111,28 +111,6 @@
font-size: 12px;
}
.panel-fullscreen {
z-index: 100;
display: block;
position: fixed;
left: 0px;
right: 0px;
top: 51px;
height: 100%;
padding: 0 10px;
background: @grafanaPanelBackground;
overflow-y: scroll;
height: 100%;
.panel-content {
padding-bottom: 130px;
}
.dropdown-menu {
margin-bottom: 70px;
}
}
.dashboard-fullscreen {
.main-view-container {
overflow: hidden;
@@ -462,8 +440,6 @@ select.grafana-target-segment-input {
line-height: 14px;
}
.grafana-tooltip hr {
padding: 2px;
color: #c8c8c8;
+35
View File
@@ -10,6 +10,11 @@
background: @grafanaPanelBackground;
margin: 5px;
position: relative;
&:hover {
.panel-actions {
display: block;
}
}
}
.panel-content {
@@ -27,6 +32,8 @@
font-weight: bold;
position: relative;
cursor: context-menu;
width: 100%;
display: block;
&.has-panel-links {
.panel-title-text:after {
@@ -72,6 +79,32 @@
bottom: 0;
}
.panel-fullscreen {
z-index: 100;
display: block;
position: fixed;
left: 0px;
right: 0px;
top: 51px;
height: 100%;
padding: 0 10px;
background: @grafanaPanelBackground;
overflow-y: scroll;
height: 100%;
.panel-content {
padding-bottom: 130px;
}
.dropdown-menu {
margin-bottom: 70px;
}
.panel-menu {
top: 0px;
}
}
.panel-menu {
z-index: 1000;
position: absolute;
@@ -124,3 +157,5 @@
border: 1px solid @grayDark;
}
}
+1 -1
View File
@@ -277,7 +277,7 @@
// Tooltips and popovers
// -------------------------
@tooltipColor: #fff;
@tooltipBackground: @heroUnitBackground;
@tooltipBackground: rgb(58, 57, 57);
@tooltipArrowWidth: 5px;
@tooltipArrowColor: @tooltipBackground;