Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard
2018-02-01 15:45:59 +01:00
19 changed files with 704 additions and 268 deletions

View File

@@ -113,6 +113,10 @@
//border: 1px solid $tight-form-func-highlight-bg;
}
.btn-transparent {
background-color: transparent;
}
.btn-outline-primary {
@include button-outline-variant($btn-primary-bg);
}

View File

@@ -274,6 +274,10 @@ $input-border: 1px solid $input-border-color;
}
}
.gf-form-input {
margin-right: 0;
}
select.gf-form-input {
text-indent: 0.01px;
text-overflow: '';
@@ -392,3 +396,17 @@ select.gf-form-input ~ .gf-form-help-icon {
top: 10px;
color: $text-muted;
}
.cta-form {
position: relative;
padding: 1rem;
background-color: $empty-list-cta-bg;
margin-bottom: 1rem;
border-top: 3px solid $green;
}
.cta-form__close {
position: absolute;
right: 0;
top: 0;
}