IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-scrollable-panels

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-11-23 10:27:16 +01:00
parent 905553052a 2d2015d3dd
commit 856a0393ab
35 changed files with 1614 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/sass/components/_panel_graph.scss
View File

@@ -280,7 +280,7 @@
.graph-annotation__header {
background-color: $popover-border-color;
padding: 0.40rem 0.65rem;
padding: 6px 10px;
display: flex;
}

7
public/sass/components/_tabbed_view.scss
View File

@@ -8,13 +8,6 @@
.tabbed-view-header {
padding: 1.5em 1rem 0 1rem;
}
.gf-tabs-link.active {
background-color: $panel-bg;
}
.tabbed-view-body {
min-height: 200px;
}
}
}

2
public/sass/components/_tabs.scss
View File

@@ -62,7 +62,7 @@
&.active:focus {
@include border-radius(3px);
border-color: rgba(216, 131, 40, 0.77);
border-bottom: 2px solid $panel-bg;
border-bottom: 1px solid $page-bg;
color: $link-color;
position: relative;
top: 1px;