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 9879-login

Browse Source
This commit is contained in:
Johannes Schill
2017-12-13 14:21:39 +01:00
parent b8bfe51b03 daf32c579d
commit c433597f99
26 changed files with 315 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/sass/components/_dashboard_list.scss
View File

@@ -24,4 +24,5 @@
.search-results-filter-row__filters-item {
width: 150px;
margin-right: 0;
}

6
public/sass/components/_switch.scss
View File

@@ -124,7 +124,7 @@
}
.gf-form-switch--search-result__section {
min-width: 3.3rem;
min-width: 3.05rem;
margin-right: -0.3rem;
input + label {
@@ -133,7 +133,7 @@
}
.gf-form-switch--search-result__item {
min-width: 2.6rem;
min-width: 2.7rem;
input + label {
height: 2.7rem;
@@ -141,7 +141,7 @@
}
.gf-form-switch--search-result-filter-row__checkbox {
min-width: 4.7rem;
min-width: 3.75rem;
input + label {
height: 2.5rem;

5
public/sass/components/_view_states.scss
View File

@@ -17,29 +17,24 @@
.panel-info-corner--info,
.panel-info-corner--links {
opacity: 0;
transition: all 1.5s ease-in-out 1s;
}
.navbar {
box-shadow: none;
background: transparent;
padding-left: $side-menu-width + 20px;
}
.navbar-page-btn {
border-color: transparent;
background: transparent;
transform: translate3d(-40px, 0, 0);
transition: all 1.5s ease-in-out 1s;
i {
opacity: 0;
transition: all 1.5s ease-in-out 1s;
}
}
.gf-timepicker-nav-btn {
transform: translate3d(40px, 0, 0);
transition: transform 1.5s ease-in-out 1s;
}
}