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' of github.com:grafana/grafana into develop

Browse Source
This commit is contained in:
Marcus Efraimsson
2017-12-06 20:35:16 +01:00
parent f87b9aaa8a e8807f4bce
commit cb0dac11a3
13 changed files with 201 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
}
.react-grid-item {
display: none;
display: none !important;
transition-property: none !important;
}

15
public/sass/components/_page_header.scss
View File

@@ -72,6 +72,21 @@
text-transform: uppercase;
}
.page-header__select_nav {
margin-bottom: 10px;
@include media-breakpoint-up(lg) {
display: none;
}
}
.page-header__tabs {
display: none;
@include media-breakpoint-up(lg) {
display: block;
}
}
.page-breadcrumbs {
display: flex;
padding: 10px 0;

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

@@ -16,7 +16,7 @@
position: relative;
display: block;
border: solid transparent;
border-width: 2px 1px 1px;
border-width: 0 1px 1px;
border-radius: 3px 3px 0 0;
i {
@@ -34,6 +34,18 @@
border-color: $orange $tab-border-color transparent;
background: $page-bg;
color: $link-color;
overflow: hidden;
&::before {
display: block;
content: ' ';
position: absolute;
left: 0;
right: 0;
height: 2px;
top: 0;
background-image: linear-gradient(to right, #ffd500 0%, #ff4400 99%, #ff4400 100%);
}
}
}