From: Dan Brown <redacted>
Date: Sat, 30 Jan 2021 22:03:16 +0000 (+0000)
Subject: Merge branch 'footer-links' of git://github.com/james-geiger/BookStack into james... 
X-Git-Tag: v21.04~1^2~15
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a6633642232efd164d4708967ab59e498fbff896

Merge branch 'footer-links' of git://github.com/james-geiger/BookStack into james-geiger-footer-links
---

a6633642232efd164d4708967ab59e498fbff896
diff --cc resources/sass/_html.scss
index 57869d652,e123ee286..026295669
--- a/resources/sass/_html.scss
+++ b/resources/sass/_html.scss
@@@ -23,6 -20,10 +23,10 @@@ html 
  body {
    font-size: $fs-m;
    line-height: 1.6;
 -  color: #444;
 +  @include lightDark(color, #444, #AAA);
    -webkit-font-smoothing: antialiased;
- }
+   background-color: #F2F2F2;
+   height: 100%;
+   display: flex;
+   flex-direction: column;
 -}
++}