Skip to content

Commit

Permalink
Fixed overlapping footer in 500 error page (autolab#1374)
Browse files Browse the repository at this point in the history
* deleted footer id to remove overlap styling

* added questions or problems? section to 404 page

* removed .rb-e and .rb.bak files that got generated

* reverted schema.rb file

* removed .bundle/config, pulled in changes frommaster

* new bundle install with changes from master:

* removed Gemfile.lock

* ran with bundle install

* reverted to old Gemfile.lock

* changed bundled with version
  • Loading branch information
michellexliu authored Oct 9, 2021
1 parent 3196238 commit 52551ed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/views/home/error.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</p>
<% end %>

<div id="footer">
<div>
<a href="/"><%= Rails.configuration.school['school_short_name'] %> Autolab</a>
<p>Questions or problems? Please <a href="/contact">contact us</a>.</p>
</div>
</div>
7 changes: 6 additions & 1 deletion app/views/home/error_404.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,9 @@
<h3>Stack Dump</h3>
<pre><%= processStackDump(@error.backtrace).join("<br>").html_safe %></pre>
</p>
<% end %>
<% end %>

<div>
<a href="/"><%= Rails.configuration.school['school_short_name'] %> Autolab</a>
<p>Questions or problems? Please <a href="/contact">contact us</a>.</p>
</div>

0 comments on commit 52551ed

Please sign in to comment.