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 'davkal/sticky-footer'

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-11-23 07:50:47 +01:00
commit 81cc24c123
2 changed files with 25 additions and 1 deletions
Show Stats 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 { .footer {
color: $footer-link-color; color: $footer-link-color;
padding: 5rem 0 1rem 0; padding: 1rem 0 1rem 0;
font-size: $font-size-sm; font-size: $font-size-sm;
position: relative; position: relative;
width: 98%; /* was causing horiz scrollbars - need to examine */ width: 98%; /* was causing horiz scrollbars - need to examine */
@ -38,6 +38,7 @@
} }
} }
// Keeping footer inside the graphic on Login screen
.login-page { .login-page {
.footer { .footer {
bottom: $spacer; bottom: $spacer;

23
public/sass/layout/_page.scss
View File

@ -40,6 +40,29 @@
&--dashboard { &--dashboard {
height: calc(100% - 56px); height: calc(100% - 56px);
} }
// Sticky footer
display: flex;
flex-direction: column;
> div {
flex-grow: 1;
}
> .footer {
flex-shrink: 0;
}
// Render in correct position even ng-view div is not rendered yet
> .footer:first-child {
flex-grow: 1;
display: flex;
> * {
width: 100%;
align-self: flex-end;
}
}
} }
// fix for phantomjs // fix for phantomjs