Merge pull request #135 from hellcp/patch-3

Make footer always be at the bottom of the page
7 years ago · f1c50408f1
parent c2f6ffc043 47a15c89b0
commit f1c50408f1
3 changed files with 16 additions and 6 deletions
--- a/resources/assets/sass/custom.scss
+++ b/resources/assets/sass/custom.scss
@ -1,3 +1,15 @@
+html, body {
+  min-height:100vh;
+}
+
+body {
+  display: flex;
+  flex-flow: column;
+}
+
+#content {
+  margin-bottom: auto !important;
+}
 body, button, input, textarea {
    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",
                 Roboto,Helvetica,Arial,sans-serif;
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@ -19,12 +19,10 @@
 </head>
 <body class="">
    @include('layouts.partial.nav')
-    <main class="">
+    <main id="content">
        @yield('content')
    </main>
-    <div class="align-items-end">
-        @include('layouts.partial.footer')
-    </div>
+    @include('layouts.partial.footer')
    <script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
    @stack('scripts')
 </body>
--- a/resources/views/layouts/partial/footer.blade.php
+++ b/resources/views/layouts/partial/footer.blade.php
@ -1,6 +1,6 @@
  <footer>
-    <div class="container mt-5">
-        <p class="text-uppercase font-weight-bold small">
+    <div class="container py-3">
+        <p class="mb-0 text-uppercase font-weight-bold small">
          <a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a>
          <a href="{{route('site.help')}}" class="text-primary pr-2">Support</a>
          <a href="" class="text-primary pr-2">API</a>