chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #135 from hellcp/patch-3 

Make footer always be at the bottom of the page
This commit is contained in:
daniel 2018-06-04 21:44:51 -06:00 committed by GitHub
parent c2f6ffc043 47a15c89b0
commit f1c50408f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/sass/custom.scss vendored
View File

@ -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;

6
resources/views/layouts/app.blade.php
View File

@ -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>

4
resources/views/layouts/partial/footer.blade.php
View File

@ -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>