Skip to content

Commit

Permalink
Merge pull request #23 from TEDxTufts/404page
Browse files Browse the repository at this point in the history
404 page
  • Loading branch information
rachaelrobinson committed Mar 6, 2017
2 parents a49120f + adaf514 commit d7c6626
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 6 deletions.
9 changes: 9 additions & 0 deletions 404.html
@@ -0,0 +1,9 @@
---
layout: base
title: Page not found
sitemap: false
---
<div class="full-page">
<br>
<h3 class="centered-text">Sorry, the page you are looking for does not exist. </h3>
</div>
2 changes: 1 addition & 1 deletion _config.yml
@@ -1,5 +1,5 @@
# Site settings
title: TEDxTufts
title: TEDxTufts
baseurl: "/" # the subpath of your site, e.g. /blog/
url: "http://www.tedxtufts.com" # the base hostname & protocol for your site

Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Expand Up @@ -2,7 +2,7 @@
<div class="row">
<div class="medium-4 columns">
<img src={{"public/TEDx_white.png" | prepend: site.baseurl }} alt="">
<a href="https://docs.google.com/forms/d/1L5d6gti8wGWYbZfe8QPD6BSfH6V1Kq3eCNTicJ47tTQ/viewform">Join our Mailing List.</a>
<a href="https://docs.google.com/forms/d/1L5d6gti8wGWYbZfe8QPD6BSfH6V1Kq3eCNTicJ47tTQ/viewform">Join our mailing list</a>
<div class="row">
<div class="small-2 columns">
<a href="https://www.facebook.com/tedxtufts"><i class="fa fa-facebook-square fa-2x" id="icon"></i></a>
Expand Down
8 changes: 5 additions & 3 deletions _includes/header.html
Expand Up @@ -10,9 +10,11 @@ <h1><a href="/"><img id="header-img" src={{"public/TEDx_white_cropped.png" | pre
<!-- Right Nav Section -->
<ul class="right">
{% for p in site.pages %}
<li {% if p.permalink == page.url %} class="active" {% endif %}>
<a href={{p.url}}>{{p.title}}</a>
</li>
{% if p.sitemap != false %}
<li {% if p.permalink == page.url %} class="active" {% endif %}>
<a href={{p.url}}>{{p.title}}</a>
</li>
{% endif %}
{% endfor %}
</ul>
<!-- Left Nav Section -->
Expand Down
6 changes: 5 additions & 1 deletion scss/home.scss
Expand Up @@ -26,6 +26,10 @@ a {
margin: 0 auto;
}

.full-page {
height: 70vh;
}

#footer{
background-color: $topbar-bg;
height: 200px;
Expand Down Expand Up @@ -126,4 +130,4 @@ button, .button {
}
img.no-resize{

}
}

0 comments on commit d7c6626

Please sign in to comment.