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

refactor(): minor refactoring of #4455

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-23 15:09:48 +01:00
parent 2d59112c1b
commit b7d198793f
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/datasources.go
View File

@ -40,7 +40,7 @@ func GetDataSources(c *middleware.Context) {
if plugin, exists := plugins.DataSources[ds.Type]; exists {
dsItem.TypeLogoUrl = plugin.Info.Logos.Small
} else {
dsItem.TypeLogoUrl = "public/img/icn-datasources.svg"
dsItem.TypeLogoUrl = "public/img/icn-datasource.svg"
}
result = append(result, dsItem)

31
public/sass/components/_gf-form.scss
View File

@ -1,9 +1,7 @@
$gf-form-margin: 0.25rem;
$gf-form-label-margin: 0.25rem;
.gf-form {
margin-bottom: $gf-form-margin;
margin-right: $gf-form-margin;
display: flex;
flex-direction: row;
align-items: center;
@ -44,18 +42,12 @@ $gf-form-label-margin: 0.25rem;
background-color: $input-label-bg;
display: block;
font-size: $font-size-sm;
margin-right: $gf-form-label-margin;
margin-right: $gf-form-margin;
border: $input-btn-border-width solid transparent;
@include border-radius($label-border-radius-sm);
}
.gf-form-label--textarea {
line-height: $input-line-height * 2;
padding-top: 0px;
padding-bottom: 16px; // $spacer (1rem) was slightly too short.
}
.gf-form-checkbox {
flex-shrink: 0;
padding: $input-padding-y $input-padding-x;
@ -73,7 +65,7 @@ $gf-form-label-margin: 0.25rem;
display: block;
width: 100%;
padding: $input-padding-y $input-padding-x;
margin-right: $gf-form-label-margin;
margin-right: $gf-form-margin;
font-size: $font-size-base;
line-height: $input-line-height;
color: $input-color;
@ -118,7 +110,7 @@ $gf-form-label-margin: 0.25rem;
.gf-form-select-wrapper {
position: relative;
background-color: $input-bg;
margin-right: $gf-form-label-margin;
margin-right: $gf-form-margin;
select.gf-form-input {
text-indent: .01px;
@ -147,18 +139,19 @@ $gf-form-label-margin: 0.25rem;
}
}
.gf-form--textarea {
align-items: flex-start;
.gf-form--v-stretch {
align-items: stretch;
}
input[type="number"].gf-natural-language-form {
font-size: $font-size-base;
line-height: $input-line-height;
margin: -6px -5px 0 5px;
padding: $input-padding-y/2 $input-padding-x/2;
}
// input[type="number"].gf-natural-language-form {
// font-size: $font-size-base;
// line-height: $input-line-height;
// margin: -6px -5px 0 5px;
// padding: $input-padding-y/2 $input-padding-x/2;
// }
.gf-form-btn {
margin-right: $gf-form-margin;
padding: $input-padding-y $input-padding-x;
line-height: $input-line-height;
flex-shrink: 0;