aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--_includes/common/footer.html15
-rw-r--r--_includes/common/header.html9
-rw-r--r--assets/css/jekyll-theme/fix_bootstrap.css10
-rw-r--r--assets/css/jekyll-theme/footer.css24
4 files changed, 19 insertions, 39 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;">
diff --git a/assets/css/jekyll-theme/fix_bootstrap.css b/assets/css/jekyll-theme/fix_bootstrap.css
index 03100b3..e6a0d4a 100644
--- a/assets/css/jekyll-theme/fix_bootstrap.css
+++ b/assets/css/jekyll-theme/fix_bootstrap.css
@@ -41,3 +41,13 @@ pre code {
.list-group-item-heading:last-child {
margin-bottom: 0;
}
+/*
+ * <pre> elements lose horizontal scrollbars on narrow displays (< 768px).
+ * Why? I don't know, but this guy does: https://stackoverflow.com/a/35423965/514684
+ */
+.container {
+ max-width: 100%;
+}
+pre {
+ position: relative;
+}
diff --git a/assets/css/jekyll-theme/footer.css b/assets/css/jekyll-theme/footer.css
index 1e05c57..4f14c0e 100644
--- a/assets/css/jekyll-theme/footer.css
+++ b/assets/css/jekyll-theme/footer.css
@@ -1,27 +1,3 @@
-html, body {
- height: 100%;
- width: 100%;
-}
-.top-level-footer-wrapper {
- height: 100%;
- width: 100%;
- display: table;
-
- /*
- * Without this property, scrollbars inside <pre> elements don't work if
- * display's width is less than 750px.
- * God, I hate CSS.
- */
- table-layout: fixed;
-}
-.footer-wrapper-collapse {
- display: table-row;
- height: 1px;
-}
-.footer-wrapper-expand {
- display: table-row;
- height: auto;
-}
footer {
margin-top: 20px;
padding: 15px 0 15px;