From 37f9ee69e7b33ac4495dd88e5cf688cd88f45810 Mon Sep 17 00:00:00 2001 From: neko Date: Wed, 19 Aug 2015 03:48:31 +0200 Subject: [PATCH] proper footer handling --- static/css/style-desktop.css | 8 +++++++- templates/default-layout.hamlet | 25 +++++++++++++++---------- templates/medium.hamlet | 6 ------ templates/profile.hamlet | 6 ------ 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/static/css/style-desktop.css b/static/css/style-desktop.css index 6ff0dc0..10573a4 100644 --- a/static/css/style-desktop.css +++ b/static/css/style-desktop.css @@ -142,7 +142,7 @@ bottom: 0; left: 0; width: 100%; - overflow: hidden; + overflow: auto; } #footer h2 @@ -153,15 +153,21 @@ #footer .left { + display: inline-block; padding: 2em; text-align: left; + float: left; } #footer .right { + /* position: absolute; bottom: 0; right: 0; + */ + float: right; + display:inline-block; padding: 2em; text-align: right; } diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index f427bea..032b23c 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -33,27 +33,32 @@ $maybe msg <- mmsg $case route $of Just HomeR get a Feed from This: - Atom + Atom | - RSS + RSS $of Just (PageR _) get a Feed from This: - Atom + Atom | - RSS + RSS $of Just (ProfileR uId) get a Feed from This: - Atom + Atom | - RSS + RSS $of Just (UserR name) get a Feed from This: - Atom + Atom | - RSS + RSS $of Just (AlbumR aId) get a Feed from This: - Atom + Atom | - RSS + RSS + $of Just (MediumR mId) + get a Feed from This: + Atom + | + RSS $of _ diff --git a/templates/medium.hamlet b/templates/medium.hamlet index 0ba44f4..46b3e79 100644 --- a/templates/medium.hamlet +++ b/templates/medium.hamlet @@ -60,12 +60,6 @@ $if userId /= Nothing ^{commentWidget}
-