Merge branch 'develop' of github.com:grafana/grafana into develop

This commit is contained in:
Torkel Ödegaard
2017-11-23 12:54:35 +01:00
2 changed files with 29 additions and 17 deletions

View File

@@ -16,12 +16,6 @@
bottom: 0;
z-index: ($zindex-modal-backdrop + 10);
position: fixed;
.label-tag {
margin-left: 6px;
font-size: 11px;
padding: 2px 6px;
}
}
// Search
@@ -84,6 +78,12 @@
position: relative;
flex-grow: 10;
.label-tag {
margin-left: 6px;
font-size: 11px;
padding: 2px 6px;
}
.selected {
.search-result-tag {
opacity: 0.70;
@@ -97,6 +97,7 @@
padding: 0.6rem 0;
color: $text-color-weak;
display: flex;
flex-grow: 1;
&:hover {
color: $text-color-weak;
@@ -107,6 +108,10 @@
}
}
.search-section__header__with-checkbox {
display: flex;
}
.search-section__header__icon {
padding: 3px 10px;
}
@@ -119,11 +124,16 @@
flex-grow: 1;
}
.search-item__with-checkbox {
display: flex;
}
.search-item {
@include list-item();
@include left-brand-border();
display: flex;
flex-grow: 1;
height: 37px;
white-space: nowrap;
padding: 0px;