From 26eaf6e89fa377c656ede296ce6656c4a76415ab Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 12:19:33 +0000
Subject: [PATCH] Merge commit '64d1d6b' into reapply-design-updates-pre-split

---
 wagtail/wagtailadmin/static/wagtailadmin/css/core.less        | 1 +
 .../wagtaildocs/templates/wagtaildocs/documents/results.html  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index f989a3f01..11d18cfb4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -19,6 +19,7 @@ max z-index: 5;
 
 html{
     background-color:@color-grey-5;
+    height:100%;
 }
 
 body{
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html
index cdff2cbb2..a0a697b26 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html
@@ -1,6 +1,8 @@
 {% if documents %}
     {% if is_searching %}
-        <h2>{{ paginator.count }} match{{ paginator|pluralize:"es" }}</h2>
+        <h2>{{ documents|length }} match{{ documents|pluralize:"es" }}</h2>
+    {% else %}
+        <h2>Latest documents</h2>
     {% endif %}
 
     {% include "wagtaildocs/documents/list.html" %}