From b5b5f1f028a81b62eed96f6f4c70a702db992e49 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Tue, 7 Jul 2015 02:50:30 +0200
Subject: [PATCH] Revert "Issue #6145: Set a fixed body-height" for global side
 effects

This reverts commit 990c678cd3a9cc529230cc417f49d2ac874b6324.
---
 Changelog.md                                 | 1 -
 app/assets/stylesheets/new_styles/_base.scss | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 088083477..493055112 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,6 @@
 * Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111)
 * Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118)
 * Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146)
-* Fix the kittens posioin on 404 pages [#6169](https://github.com/diaspora/diaspora/pull/6169)
 
 ## Features
 * Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index a545ee125..318b99484 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -2,7 +2,6 @@ html,
 body {
   /* hack to ensure fixed elements at height: 100%; are in relation to the window */
   max-height : 100%;
-  height: 100%;
 }
 
 body {