From 3aed7ec99b18c8b06c9f9d31a80c01d95d6afae0 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 3 Sep 2016 16:51:25 +0200 Subject: [PATCH] add footer to eventpage, make sticky --- content/assets/stylesheets/includes/general.scss | 3 ++- content/assets/stylesheets/main.scss | 11 +++++++++++ layouts/default.erb | 7 +++++-- layouts/generic.erb | 15 --------------- layouts/partials/_footer.erb | 15 +++++++++++++++ 5 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 layouts/partials/_footer.erb diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index e58252b..b54204b 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -39,7 +39,8 @@ } } -footer { +footer.footer { + padding-bottom: 40px; .fa { font-size: inherit; text-align: inherit; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 8ad3912..1fbda21 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -9,6 +9,17 @@ $family-sans-serif: 'Fira Sans', sans-serif; flex: none; } +body.site { + display: flex; + min-height: 100vh; + flex-direction: column; + + .wrapper { + flex: 1; + } +} + + @import "includes/cammie"; @import "includes/events"; @import "includes/tiles"; diff --git a/layouts/default.erb b/layouts/default.erb index 8f755dc..5cb0b63 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -38,7 +38,10 @@ <%= content_for(@item, :head) %> - - <%= yield %> + +
+ <%= yield %> +
+ <%= render '/partials/_footer.*' %> diff --git a/layouts/generic.erb b/layouts/generic.erb index 2e02fbb..ae4c54a 100644 --- a/layouts/generic.erb +++ b/layouts/generic.erb @@ -6,18 +6,3 @@ <%= yield %> - diff --git a/layouts/partials/_footer.erb b/layouts/partials/_footer.erb new file mode 100644 index 0000000..0e0f7a5 --- /dev/null +++ b/layouts/partials/_footer.erb @@ -0,0 +1,15 @@ +