From cc0629337708a67092d7e9aff61974a27a363c5f Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Sun, 12 Apr 2015 11:28:12 -0400
Subject: [PATCH 1/2] Redesign error pages

---
 .../stylesheets/app/components/equator.scss   | 11 -----
 app/views/errors/error.html.erb               | 16 ++-----
 app/views/errors/not_found.html.erb           | 43 +++++++------------
 3 files changed, 20 insertions(+), 50 deletions(-)
 delete mode 100644 app/assets/stylesheets/app/components/equator.scss

diff --git a/app/assets/stylesheets/app/components/equator.scss b/app/assets/stylesheets/app/components/equator.scss
deleted file mode 100644
index b1e179b84..000000000
--- a/app/assets/stylesheets/app/components/equator.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.equator {
-  display: table;
-  width: 100%;
-  height: 100%; /* For Firefox */
-  min-height: 100%;
-}
-
-.equator-container {
-  display: table-cell;
-  vertical-align: middle;
-}
diff --git a/app/views/errors/error.html.erb b/app/views/errors/error.html.erb
index 5c025cb0d..fc3c35612 100644
--- a/app/views/errors/error.html.erb
+++ b/app/views/errors/error.html.erb
@@ -1,13 +1,5 @@
-<div class="modal equator">
-  <div class="equator-container">
-    <div class="modal-dialog">
-      <div class="modal-content center">
-        <div class="modal-body">
-          <h3>Sorry, something went wrong with Assembly.</h3>
-          <p>We've been notified and should have it fixed soon.</p>
-          <a href="<%= root_url %>">Assembly Home</a>
-        </div>
-      </div>
-    </div>
-  </div>
+<article class="sm-col-11 md-col-6 mx-auto mt3 bg-white rounded border border-darken-2 center p4">
+  <h3 class="mt0 red">Sorry, Assembly had a problem.</h3>
+  <p>We've been notified and should have it fixed soon.</p>
+  <a href="<%= root_url %>" class="button button--default">Go back home</a>
 </div>
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index 0784fca20..f5666f712 100644
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -1,35 +1,24 @@
 <style>
-  html {
-  background: url(<%= image_path("404/#{@background}.jpg") %>) no-repeat center center fixed;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-  }
-  .navbar{
-    z-index:2000;
+  body {
+    background: url(<%= image_path("404/#{@background}.jpg") %>) no-repeat center center fixed;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
   }
 </style>
 
 <%= render 'shared/navbar' %>
 
-<div class="modal equator">
-  <div class="equator-container">
-    <div class="modal-dialog">
-      <div class="center">
-        <div class="modal-body">
-          <h3 <% if [3,5].include?(@background) %>style="color:#eee;"<% end %>>We still haven't found what you're looking for</h3>
-          <form action="<%= discover_path %>">
-            <div class="form-group has-feedback">
-              <div class="input-group-search">
-                <input type="search" name="search" value="<%= params[:search] %>" placeholder="Search" class="form-control" autocomplete="off">
-              </div>
-              <input type="hidden" name="type" value="">
-            </div>
-            <button type="submit" class="btn btn-default sr-only">Search</button>
-          </form>
-        </div>
+<article class="sm-col-11 md-col-6 mx-auto mt4 center">
+  <h3 class-"mt0" <% if [3,5].include?(@background) %>style="color:#eee;"<% end %>>We couldn't find that :(</h3>
+  <form action="<%= discover_path %>">
+    <div class="form-group has-feedback">
+      <div class="input-group-search">
+        <input type="search" name="search" value="<%= params[:search] %>" placeholder="Search" class="form-control" autocomplete="off">
       </div>
+      <input type="hidden" name="type" value="">
     </div>
-  </div>
-</div>
+    <button type="submit" class="button button--default sr-only">Search</button>
+  </form>
+</article>

From 6574de4528cca13b5c2083da044d2e9e6462af37 Mon Sep 17 00:00:00 2001
From: lachlanjc <hello@lachlanjc.me>
Date: Sun, 17 May 2015 14:42:14 -0400
Subject: [PATCH 2/2] No more article tags

---
 app/views/errors/error.html.erb     | 2 +-
 app/views/errors/not_found.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/errors/error.html.erb b/app/views/errors/error.html.erb
index fc3c35612..948cbe4d0 100644
--- a/app/views/errors/error.html.erb
+++ b/app/views/errors/error.html.erb
@@ -1,4 +1,4 @@
-<article class="sm-col-11 md-col-6 mx-auto mt3 bg-white rounded border border-darken-2 center p4">
+<div class="sm-col-11 md-col-6 mx-auto mt3 bg-white rounded border border-darken-2 center p4">
   <h3 class="mt0 red">Sorry, Assembly had a problem.</h3>
   <p>We've been notified and should have it fixed soon.</p>
   <a href="<%= root_url %>" class="button button--default">Go back home</a>
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index f5666f712..a8d4a515f 100644
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -10,7 +10,7 @@
 
 <%= render 'shared/navbar' %>
 
-<article class="sm-col-11 md-col-6 mx-auto mt4 center">
+<div class="sm-col-11 md-col-6 mx-auto mt4 center">
   <h3 class-"mt0" <% if [3,5].include?(@background) %>style="color:#eee;"<% end %>>We couldn't find that :(</h3>
   <form action="<%= discover_path %>">
     <div class="form-group has-feedback">
@@ -21,4 +21,4 @@
     </div>
     <button type="submit" class="button button--default sr-only">Search</button>
   </form>
-</article>
+</div>