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 'panel-edit-in-react' into panel-edit-in-react-sidemenu

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-11-23 14:01:18 +01:00
parent 9caae8c8c0 263381eac6
commit daee874ee6
86 changed files with 2072 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/sass/components/_footer.scss
View File

@@ -4,7 +4,7 @@
.footer {
color: $footer-link-color;
padding: 5rem 0 1rem 0;
padding: 1rem 0 1rem 0;
font-size: $font-size-sm;
position: relative;
width: 98%; /* was causing horiz scrollbars - need to examine */
@@ -38,6 +38,7 @@
}
}
// Keeping footer inside the graphic on Login screen
.login-page {
.footer {
bottom: $spacer;

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

@@ -82,7 +82,7 @@ $input-border: 1px solid $input-border-color;
align-content: flex-start;
.gf-form + .gf-form {
margin-right: $gf-form-margin;
margin-left: $gf-form-margin;
}
}
@@ -163,7 +163,6 @@ $input-border: 1px solid $input-border-color;
width: 100%;
height: $gf-form-input-height;
padding: $input-padding-y $input-padding-x;
margin-right: $gf-form-margin;
font-size: $font-size-md;
line-height: $input-line-height;
color: $input-color;

2
public/sass/components/_query_editor.scss
View File

@@ -35,7 +35,7 @@
}
.gf-form + .gf-form {
margin-right: 0;
margin-left: 0;
}
}