Browse Source

Fix page load error

Thibaut 10 years ago
parent
commit
c0a5560ba9

+ 2 - 2
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> """
 

+ 1 - 0
assets/stylesheets/components/_page.scss

@@ -4,6 +4,7 @@
 
 ._page {
   position: relative;
+  min-height: calc(100% - 1.25rem);
 
   &._page-error { position: static; }