From 37352b1b1066ecd07702ee949e65dea42e857b77 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Wed, 22 Jul 2015 02:40:23 +0200
Subject: [PATCH] Sticky footer

---
 .../branding/logos/powered_by_diaspora.png    | Bin 1681 -> 0 bytes
 app/assets/stylesheets/footer.scss            |  33 +++++++++---------
 app/assets/stylesheets/mobile/mobile.scss     |   2 +-
 app/assets/stylesheets/new_styles/_base.scss  |   6 ----
 app/views/layouts/_footer.html.haml           |   6 ++--
 5 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 app/assets/images/branding/logos/powered_by_diaspora.png

diff --git a/app/assets/images/branding/logos/powered_by_diaspora.png b/app/assets/images/branding/logos/powered_by_diaspora.png
deleted file mode 100644
index 3979f5be721b8a28f7ece55d0a7e3c1648c342cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1681
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
b{wcr!=AG41C~N!;00000NkvXXu0mjfGF(yo

diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss
index 2fc0168a5..f47e07b6b 100644
--- a/app/assets/stylesheets/footer.scss
+++ b/app/assets/stylesheets/footer.scss
@@ -1,28 +1,29 @@
+html {
+  min-height: 100%;
+  position: relative;
+}
+
+body { margin-bottom: 150px; }
+
 footer {
-  width: 100%;
-  left: 0;
+  background-color: $background-grey;
+  border-top: 1px solid $border-grey;
   bottom: 0;
-  color: $text-grey;
+  max-height: 130px;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  position: absolute;
+  width: 100%;
 
-  .container {
-    width: 95%;
-    margin: 4em auto 0 auto;
-    padding: 0.5em 0 1em 0;
-    border-top: 1px solid $border-grey;
-  }
-
-  .logos-powered_by_diaspora {
-    display: inline-block;
-    margin-top: 3px;
-    height: 11px;
-    width: 145px;
+  .powered-by-diaspora {
+    color: $link-grey;
+    font-weight: bold;
   }
 
   ul#footer_nav {
     margin: 0;
     padding: 0;
     display: inline-block;
-    float: right;
 
     > li {
       display: inline;
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index ca3bbb840..7a6d14476 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -6,7 +6,7 @@
 @import 'entypo';
 @import 'icons';
 
-@import "header";
+@import "mobile/header";
 @import "mobile/tags";
 @import "mobile/conversations";
 @import "mobile/settings";
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index 95ecb30d8..e95f48fbc 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -1,9 +1,3 @@
-html,
-body {
-  /* hack to ensure fixed elements at height: 100%; are in relation to the window */
-  max-height : 100%;
-}
-
 body {
   margin-top: 50px;
   padding : none;
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 12236d956..81079a730 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,5 +1,7 @@
 %footer
   .container
-    .logos-powered_by_diaspora
-    %ul#footer_nav
+    .pull-left
+      .powered-by-diaspora
+        powered by diaspora*
+    %ul#footer_nav.pull-right
       = render :partial =>'shared/links'