From c0a5560ba9d45a81bfefddf944cdc746a0a7cbaa Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut@me.com>
Date: Sun, 9 Aug 2015 13:19:22 -0400
Subject: [PATCH] Fix page load error

---
 assets/javascripts/templates/error_tmpl.coffee | 4 ++--
 assets/stylesheets/components/_page.scss       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/templates/error_tmpl.coffee b/assets/javascripts/templates/error_tmpl.coffee
index ae060069..884efd25 100644
--- a/assets/javascripts/templates/error_tmpl.coffee
+++ b/assets/javascripts/templates/error_tmpl.coffee
@@ -11,9 +11,9 @@ app.templates.notFoundPage = ->
         back
 
 app.templates.pageLoadError = ->
-  error """ Oops, that page failed to load. """,
+  error """ Oops, the page failed to load. """,
         """ It may be missing from the server (try reloading the app) or you could be offline.<br>
-            If you keep seeing this, you're likely behind a proxy or firewall which blocks cross-domain requests. """,
+            If you keep seeing this, you're likely behind a proxy or firewall that blocks cross-domain requests. """,
         """ #{back} &middot; <a href="/##{location.pathname}" target="_top" class="_error-link">Reload</a>
             &middot; <a href="#" class="_error-link" data-retry>Retry</a> """
 
diff --git a/assets/stylesheets/components/_page.scss b/assets/stylesheets/components/_page.scss
index 357a82bf..93db11ec 100644
--- a/assets/stylesheets/components/_page.scss
+++ b/assets/stylesheets/components/_page.scss
@@ -4,6 +4,7 @@
 
 ._page {
   position: relative;
+  min-height: calc(100% - 1.25rem);
 
   &._page-error { position: static; }