jefffohl
diff --git a/‎src/components/ErrorPage/ErrorPage.js‎
Lines changed: 12 additions & 2 deletions b/‎src/components/ErrorPage/ErrorPage.js‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎src/components/ErrorPage/ErrorPage.scss‎
Lines changed: 12 additions & 9 deletions b/‎src/components/ErrorPage/ErrorPage.scss‎
Lines changed: 12 additions & 9 deletions
diff --git a/‎src/components/NotFoundPage/NotFoundPage.js‎
Lines changed: 0 additions & 39 deletions b/‎src/components/NotFoundPage/NotFoundPage.js‎
Lines changed: 0 additions & 39 deletions
diff --git a/‎src/components/NotFoundPage/NotFoundPage.scss‎
Lines changed: 0 additions & 53 deletions b/‎src/components/NotFoundPage/NotFoundPage.scss‎
Lines changed: 0 additions & 53 deletions
diff --git a/‎src/components/NotFoundPage/package.json‎
Lines changed: 0 additions & 6 deletions b/‎src/components/NotFoundPage/package.json‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎src/routes.js‎
Lines changed: 2 additions & 4 deletions b/‎src/routes.js‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎src/views/error.jade‎
Lines changed: 1 addition & 3 deletions b/‎src/views/error.jade‎
Lines changed: 1 addition & 3 deletions
@@ -11,7 +11,8 @@ import React, { Component, PropTypes } from 'react';
 import withStyles from 'isomorphic-style-loader/lib/withStyles';
 import s from './ErrorPage.scss';
 
-const title = 'Error';
+let title = 'Error';
+let content = 'Sorry, a critical error occurred on this page.';
 
 class ErrorPage extends Component {
 
@@ -20,15 +21,24 @@ class ErrorPage extends Component {
     onPageNotFound: PropTypes.func.isRequired,
   };
 
+  static propTypes = {
+    statusCode: PropTypes.number,
+  };
+
   componentWillMount() {
     this.context.onSetTitle(title);
   }
 
   render() {
+    if (this.props.statusCode === 404) {
+      title = 'Page Not Found';
+      content = 'Sorry, the page you were trying to view does not exist.';
+    }
+
     return (
       <div>
         <h1>{title}</h1>
-        <p>Sorry, an critical error occurred on this page.</p>
+        <p>{content}</p>
       </div>
     );
   }
 
@@ -8,47 +8,50 @@
  */
 
 * {
-  margin: 0;
   line-height: 1.2;
+  margin: 0;
 }
 
 html {
+  color: #888;
   display: table;
-  width: 100%;
+  font-family: sans-serif;
   height: 100%;
-  color: #888;
   text-align: center;
-  font-family: sans-serif;
+  width: 100%;
 }
 
 body {
   display: table-cell;
-  margin: 2em auto;
   vertical-align: middle;
+  margin: 2em auto;
 }
 
 h1 {
   color: #555;
-  font-weight: 400;
   font-size: 2em;
+  font-weight: 400;
 }
 
 p {
   margin: 0 auto;
   width: 280px;
 }
 
+pre {
+  text-align: left;
+  margin-top: 2rem;
+}
+
 @media only screen and (max-width: 280px) {
 
-  body,
-  p {
+  body, p {
     width: 95%;
   }
 
   h1 {
     font-size: 1.5em;
     margin: 0 0 0.3em;
-
   }
 
 }
@@ -12,7 +12,6 @@ import Router from 'react-routing/src/Router';
 import fetch from './core/fetch';
 import App from './components/App';
 import ContentPage from './components/ContentPage';
-import NotFoundPage from './components/NotFoundPage';
 import ErrorPage from './components/ErrorPage';
 
 const routes = [
@@ -39,9 +38,8 @@ const router = new Router(on => {
     return data && data.content && <ContentPage {...data.content} />;
   });
 
-  on('error', (state, error) => state.statusCode === 404 ?
-    <App context={state.context} error={error}><NotFoundPage /></App> :
-    <App context={state.context} error={error}><ErrorPage /></App>
+  on('error', (state, error) =>
+    <App context={state.context} error={error}><ErrorPage statusCode={state.statusCode} /></App>
   );
 });
 
 
@@ -5,7 +5,6 @@ html(lang="en")
     title Internal Server Error
     meta(name="viewport", content="width=device-width, initial-scale=1")
     style.
-
       * {
         line-height: 1.2;
         margin: 0;
@@ -39,8 +38,7 @@ html(lang="en")
 
       pre {
         text-align: left;
-        max-width: 1000px;
-        margin: 0 auto;
+        margin-top: 2rem;
       }
 
       @media only screen and (max-width: 280px) {