Merge branch 'master' into toni-moreno-add_shared_tooltips_to_graphs

This commit is contained in:
Torkel Ödegaard
2014-09-29 14:25:25 +02:00
28 changed files with 189 additions and 397 deletions
+3 -2
View File
@@ -117,8 +117,9 @@
}
.dashboard-fullscreen {
.row-control-inner {
display: none;
.main-view-container {
height: 0;
overflow: hidden;
}
}
+1 -1
View File
@@ -124,7 +124,7 @@
.graph-legend-series-hidden {
a {
color: darken(@linkColor, 45%);
color: @linkColorDisabled;
}
}
+1 -1
View File
@@ -5,6 +5,6 @@
}
.annotation-disabled, .annotation-disabled a {
color: darken(@textColor, 25%);
color: @linkColorDisabled;
}
+1
View File
@@ -52,6 +52,7 @@
// Links
// -------------------------
@linkColor: darken(@white,11%);
@linkColorDisabled: darken(@linkColor,45%);
@linkColorHover: @white;
+2 -1
View File
@@ -54,12 +54,13 @@
// Scaffolding
// -------------------------
@bodyBackground: @grayLighter;
@textColor: #555;
@textColor: #666;
// Links
// -------------------------
@linkColor: @textColor;
@linkColorDisabled: lighten(@linkColor,35%);
@linkColorHover: @blue;