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 pull request #4455 from grafana/g3-app-improvements

Browse Source 
Form adjustments for app work
This commit is contained in:
Torkel Ödegaard 2016-03-23 14:32:42 +01:00
commit 2d59112c1b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,12 @@ $gf-form-label-margin: 0.25rem;
@include border-radius($label-border-radius-sm); @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 { .gf-form-checkbox {
flex-shrink: 0; flex-shrink: 0;
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
@ -67,6 +73,7 @@ $gf-form-label-margin: 0.25rem;
display: block; display: block;
width: 100%; width: 100%;
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
margin-right: $gf-form-label-margin;
font-size: $font-size-base; font-size: $font-size-base;
line-height: $input-line-height; line-height: $input-line-height;
color: $input-color; color: $input-color;
@ -111,6 +118,7 @@ $gf-form-label-margin: 0.25rem;
.gf-form-select-wrapper { .gf-form-select-wrapper {
position: relative; position: relative;
background-color: $input-bg; background-color: $input-bg;
margin-right: $gf-form-label-margin;
select.gf-form-input { select.gf-form-input {
text-indent: .01px; text-indent: .01px;
@ -139,8 +147,15 @@ $gf-form-label-margin: 0.25rem;
} }
} }
.gf-form-select-wrapper + .gf-form-select-wrapper { .gf-form--textarea {
margin-left: $gf-form-label-margin; align-items: flex-start;
}
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 { .gf-form-btn {