Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign error pages #269

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Redesign error pages #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc06293
Redesign error pages
Apr 12, 2015
6574de4
No more article tags
May 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions app/assets/stylesheets/app/components/equator.scss
View file
Open in desktop

This file was deleted.

16 changes: 4 additions & 12 deletions app/views/errors/error.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<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>
</div>
41 changes: 15 additions & 26 deletions app/views/errors/not_found.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<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">
<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>
<button type="submit" class="button button--default sr-only">Search</button>
</form>
</div>