aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/_includes/common
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-03-22 19:40:45 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2022-03-22 19:50:51 +0300
commitc962bbcf28a00b0de1498d6c7af7247c280bcbb6 (patch)
tree14a7842c275fed693c13fe82ac5580920f45567f /_includes/common
parentfooter: clean up whitespace in the include (diff)
downloadjekyll-theme-c962bbcf28a00b0de1498d6c7af7247c280bcbb6.tar.gz
jekyll-theme-c962bbcf28a00b0de1498d6c7af7247c280bcbb6.zip
footer: switch implementation to flexbox
God, this is better.
Diffstat (limited to '')
-rw-r--r--_includes/common/footer.html15
-rw-r--r--_includes/common/header.html9
2 files changed, 9 insertions, 15 deletions
diff --git a/_includes/common/footer.html b/_includes/common/footer.html
index c337b3b..9331784 100644
--- a/_includes/common/footer.html
+++ b/_includes/common/footer.html
@@ -1,10 +1,8 @@
- </div>
</div>
- <div class="footer-wrapper-collapse">
- <footer class="navbar-default">
- <div class="container">
- <div class="row">
- <div class="col-xs-12 text-center">
+ <footer class="navbar-default">
+ <div class="container">
+ <div class="row">
+ <div class="col-xs-12 text-center">
{% if site.settings.project.license_file %}
{% capture license_file %}{{ '/' | relative_url }}{{ site.settings.project.license_file }}{% endcapture %}
@@ -40,11 +38,10 @@
{% if license_text %}{{ license_text }}{{ sep }}{% endif %}{{ timestamp_text }}
</div>
- </div>
</div>
</div>
- </footer>
- </div>
+ </div>
+ </footer>
</div>
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
<script src="{{ '/assets/bootstrap/js/bootstrap.min.js' | relative_url }}"></script>
diff --git a/_includes/common/header.html b/_includes/common/header.html
index 3765ae6..b43a592 100644
--- a/_includes/common/header.html
+++ b/_includes/common/header.html
@@ -75,11 +75,8 @@
{% endif %}
</head>
<body>
- <div class="top-level-footer-wrapper">
+ <div style="display: flex; flex-direction: column; min-height: 100vh;">
{% unless site.settings.navbar.hide or page.navbar.hide %}
- <div class="footer-wrapper-collapse">
- {% include common/navbar.html %}
- </div>
+ {% include common/navbar.html %}
{% endunless %}
- <div class="footer-wrapper-expand">
- <div class="container">
+ <div class="container" style="flex: 1;">