Merge branch 'develop' of github.com:diaspora/diaspora into develop

app/assets/stylesheets/footer.scss

@@ -1,28 +1,29 @@
+html {
+  min-height: 100%;
+  position: relative;
+}
+
+body { margin-bottom: 150px; }
+
 footer {
-  width: 100%;
+  background-color: $background-grey;
-  left: 0;
+  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 {
+  .powered-by-diaspora {
-    width: 95%;
+    color: $link-grey;
-    margin: 4em auto 0 auto;
+    font-weight: bold;
-    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;
   }
 
   ul#footer_nav {
     margin: 0;
     padding: 0;
     display: inline-block;
-    float: right;
 
     > li {
       display: inline;

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";

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;

app/views/layouts/_footer.html.haml

@@ -1,5 +1,7 @@
 %footer
   .container
-    .logos-powered_by_diaspora
+    .pull-left
-    %ul#footer_nav
+      .powered-by-diaspora
+        powered by diaspora*
+    %ul#footer_nav.pull-right
       = render :partial =>'shared/links'