mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-24 08:44:02 +00:00
Merge pull request #135 from hellcp/patch-3
Make footer always be at the bottom of the page
This commit is contained in:
commit
f1c50408f1
3 changed files with 16 additions and 6 deletions
12
resources/assets/sass/custom.scss
vendored
12
resources/assets/sass/custom.scss
vendored
|
@ -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;
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue