From ea16c6dc07e6d238032b1984762c696ba9cf6348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=BCller?= Date: Tue, 23 Dec 2014 21:10:14 +0100 Subject: [PATCH] footer styling implemented using flexbox --- resources/public/js/themes.js | 10 ---------- resources/public/styles/main.less | 11 ++++++++++- src/notehub/views.clj | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/resources/public/js/themes.js b/resources/public/js/themes.js index 303ff02..718855c 100644 --- a/resources/public/js/themes.js +++ b/resources/public/js/themes.js @@ -112,21 +112,11 @@ function showPage() { less = { modifyVars: vars }; - putFooter(); var script = document.createElement("script"); script.type = "text/javascript"; script.src = "//cdnjs.cloudflare.com/ajax/libs/less.js/2.1.0/less.min.js"; document.head.appendChild(script); } -function putFooter(){ - var elem = $("footer"); - if(!elem) return; - if(window.innerHeight * 0.85 >= document.body.clientHeight) { - elem.style.position = "fixed"; - elem.style.bottom = 0; - } -} - // for the case if main.js is not loaded var onLoad = showPage; diff --git a/resources/public/styles/main.less b/resources/public/styles/main.less index e319dea..4845118 100644 --- a/resources/public/styles/main.less +++ b/resources/public/styles/main.less @@ -100,7 +100,6 @@ html, body { color: @foreground; margin: 0; padding: 0; - display: block !important; } #hero { padding-top: 5em; @@ -141,6 +140,8 @@ article { .central-element; margin-top: 5em; text-align: justify; + flex: 1; + -webkit-flex: 1; } article p { font-size: 1.2em * @text_size_factor; @@ -203,3 +204,11 @@ td { .middot { padding: 0.5em; } + +body { + display: flex !important; + display: -webkit-flex !important; + min-height: 100vh; + flex-direction: column; + -webkit-flex-direction: column; +} diff --git a/src/notehub/views.clj b/src/notehub/views.clj index ce3c591..117c215 100644 --- a/src/notehub/views.clj +++ b/src/notehub/views.clj @@ -33,7 +33,7 @@ (include-js "//cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js") (include-js "/js/md5.js") (include-js "/js/main.js")))] - [:body {:style "display: none;" :onload "onLoad()"} content])) + [:body {:style "display: none" :onload "onLoad()"} content])) (defn- sanitize "Breakes all usages of