Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
fixing problems
Browse files Browse the repository at this point in the history
  • Loading branch information
@SapientBoston
SapientBoston committed Jun 24, 2015
1 parent 5630872 commit b3fef2d
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 269 deletions.
6 changes: 1 addition & 5 deletions 404.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ author: joe_morgan
excerpt: "Page not found. Your pixels are in another canvas."
sitemap: false
permalink: /404.html
---
---

Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.

<script type="text/javascript">
var GOOG_FIXURL_LANG = 'en';
<<<<<<< HEAD
var GOOG_FIXURL_SITE = '{{ site.url }}'
=======
var GOOG_FIXURL_SITE = '{{ site.baseurl }}'
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
</script>
<script type="text/javascript"
src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
Expand Down
39 changes: 0 additions & 39 deletions _includes/_head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,27 @@
<meta name="google-site-verification" content="{{ site.owner.google.verify }}">{% endif %}
{% if site.owner.bing-verify %}<meta name="msvalidate.01" content="{{ site.owner.bing-verify }}">{% endif %}

<<<<<<< HEAD
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
<link rel="canonical" href="{{ canonical }}">
<link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
=======
{% capture canonical %}{{ site.baseurl }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
<link rel="canonical" href="{{ canonical }}">
<link href="{{ site.baseurl }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694

<!-- http://t.co/dKP3o1e -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- For all browsers -->
<<<<<<< HEAD
<link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
=======
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css">
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694

<meta http-equiv="cleartype" content="on">

<!-- HTML5 Shiv and Media Query Support -->
<!--[if lt IE 9]>
<<<<<<< HEAD
<script src="{{ site.url }}/assets/js/vendor/html5shiv.min.js"></script>
<script src="{{ site.url }}/assets/js/vendor/respond.min.js"></script>
<![endif]-->

<!-- Modernizr -->
<script src="{{ site.url }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
=======
<script src="{{ site.baseurl }}/assets/js/vendor/html5shiv.min.js"></script>
<script src="{{ site.baseurl }}/assets/js/vendor/respond.min.js"></script>
<![endif]-->

<!-- Modernizr -->
<script src="{{ site.baseurl }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694

<link href='//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic' rel='stylesheet' type='text/css'>

<!-- Icons -->
<!-- 16x16 -->
<<<<<<< HEAD
<link rel="shortcut icon" href="{{ site.url }}/favicon.ico">
<!-- 32x32 -->
<link rel="shortcut icon" href="{{ site.url }}/favicon.png">
Expand All @@ -70,16 +44,3 @@
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.url }}/images/apple-touch-icon-114x114-precomposed.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.url }}/images/apple-touch-icon-144x144-precomposed.png">
=======
<link rel="shortcut icon" href="{{ site.baseurl }}/favicon.ico">
<!-- 32x32 -->
<link rel="shortcut icon" href="{{ site.baseurl }}/favicon.png">
<!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
<link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/images/apple-touch-icon-precomposed.png">
<!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.baseurl }}/images/apple-touch-icon-72x72-precomposed.png">
<!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.baseurl }}/images/apple-touch-icon-114x114-precomposed.png">
<!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/images/apple-touch-icon-144x144-precomposed.png">
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
4 changes: 0 additions & 4 deletions _includes/_navigation.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<div class="navigation-wrapper">
<div class="site-name">
<<<<<<< HEAD
<a href="{{ site.url }}/">{{ site.title }}</a>
=======
<a href="{{ site.baseurl }}/">{{ site.title }}</a>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
</div><!-- /.site-name -->
<div class="top-navigation">
<nav role="navigation" id="site-nav" class="nav">
Expand Down
16 changes: 0 additions & 16 deletions _includes/_open-graph.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,20 @@
{% if author.twitter %}<meta name="twitter:creator" content="@{{ author.twitter }}">{% endif %}
{% if page.image.feature %}
<meta name="twitter:card" content="summary_large_image">
<<<<<<< HEAD
<meta name="twitter:image" content="{{ site.url }}/images/{{ page.image.feature }}">
{% else %}
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/default-thumb.png{% endif %}">
=======
<meta name="twitter:image" content="{{ site.baseurl }}/images/{{ page.image.feature }}">
{% else %}
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="{% if page.image.thumb %}{{ site.baseurl }}/images/{{ page.image.thumb }}{% else %}{{ site.baseurl }}/images/default-thumb.png{% endif %}">
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
<!-- Open Graph -->
<meta property="og:locale" content="{{ site.locale }}">
<meta property="og:type" content="article">
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
{% if page.excerpt %}<meta property="og:description" content="{{ page.excerpt | strip_html }}">{% endif %}
<<<<<<< HEAD
<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.url }}">
<meta property="og:site_name" content="{{ site.title }}">
{% if page.image.feature %}
<meta property="og:image" content="{{ site.url }}/images/{{ page.image.feature }}">
{% else %}
<meta property="og:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/default-thumb.png{% endif %}">
=======
<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
<meta property="og:site_name" content="{{ site.title }}">
{% if page.image.feature %}
<meta property="og:image" content="{{ site.baseurl }}/images/{{ page.image.feature }}">
{% else %}
<meta property="og:image" content="{% if page.image.thumb %}{{ site.baseurl }}/images/{{ page.image.thumb }}{% else %}{{ site.baseurl }}/images/default-thumb.png{% endif %}">
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
5 changes: 0 additions & 5 deletions _includes/_scripts.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<<<<<<< HEAD
<script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="{{ site.url }}/assets/js/scripts.min.js"></script>
=======
<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="{{ site.baseurl }}/assets/js/scripts.min.js"></script>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% if site.owner.google.analytics %}
<!-- Asynchronous Google Analytics snippet -->
<script>
Expand Down
10 changes: 0 additions & 10 deletions _includes/_social-share.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@
<h4>Share on</h4>
<ul>
<li>
<<<<<<< HEAD
<a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
</li>
<li>
<a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
</li>
<li>
<a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
=======
<a href="https://twitter.com/intent/tweet?text={{ site.baseurl }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
</li>
<li>
<a href="https://www.facebook.com/sharer/sharer.php?u={{ site.baseurl }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
</li>
<li>
<a href="https://plus.google.com/share?url={{ site.baseurl }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
</li>
</ul>
</div><!-- /.social-share -->
15 changes: 0 additions & 15 deletions _layouts/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
<<<<<<< HEAD
"{{ site.url }}/images/{{ page.image.feature }}"
=======
"{{ site.baseurl }}/images/{{ page.image.feature }}"
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
Expand All @@ -37,7 +33,6 @@
{% include _author-bio.html %}
</div>
<div id="index">
<<<<<<< HEAD
<h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
{% for post in site.posts limit:5 %}
<article>
Expand All @@ -46,16 +41,6 @@ <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.titl
<a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
{% else %}
<h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
=======
<h3><a href="{{ site.baseurl}}/posts/">Recent Posts</a></h3>
{% for post in site.posts limit:5 %}
<article>
{% if post.link %}
<h2 class="link-post"><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a>
<a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
{% else %}
<h2><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
<p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
{% endif %}
</article>
Expand Down
6 changes: 1 addition & 5 deletions _layouts/page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
<<<<<<< HEAD
"{{ site.url }}/images/{{ page.image.feature }}"
=======
"{{ site.baseurl }}/images/{{ page.image.feature }}"
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
Expand Down Expand Up @@ -57,7 +53,7 @@ <h1>{{ page.title }}</h1>
</footer>
</div><!-- /.footer-wrap -->

{% include _scripts.html %}
{% include _scripts.html %}

</body>
</html>
10 changes: 0 additions & 10 deletions _layouts/post-index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
<<<<<<< HEAD
"{{ site.url }}/images/{{ page.image.feature }}"
=======
"{{ site.baseurl }}/images/{{ page.image.feature }}"
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
Expand All @@ -50,15 +46,9 @@ <h3>{{ post.date | date: '%Y' }}</h3>
{% endunless %}
<article>
{% if post.link %}
<<<<<<< HEAD
<h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
{% else %}
<h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
=======
<h2 class="link-post"><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h2>
{% else %}
<h2><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
<p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
{% endif %}
</article>
Expand Down
17 changes: 1 addition & 16 deletions _layouts/post.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
<<<<<<< HEAD
"{{ site.url }}/images/{{ page.image.feature }}"
=======
"{{ site.baseurl }}/images/{{ page.image.feature }}"
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
Expand All @@ -41,11 +37,7 @@
{% if page.link %}
<h1><a href="{{ page.link }}">{{ page.title }}</a></h1>
{% else %}
<<<<<<< HEAD
<h1><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
=======
<h1><a href="{{ site.baseurl }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endif %}
</div><!--/ .headline-wrap -->
<div class="article-wrap">
Expand All @@ -65,17 +57,10 @@ <h1><a href="{{ site.baseurl }}{{ page.url }}" rel="bookmark" title="{{ page.tit
<div class="footer-wrap">
{% if site.related_posts.size > 0 %}
<div class="related-articles">
<<<<<<< HEAD
<h4>You might also enjoy <small class="pull-right">(<a href="{{ site.url }}/posts/">View all posts</a>)</small></h4>
<ul>
{% for post in site.related_posts limit:3 %}
<li><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
=======
<h4>You might also enjoy <small class="pull-right">(<a href="{{ site.baseurl }}/posts/">View all posts</a>)</small></h4>
<ul>
{% for post in site.related_posts limit:3 %}
<li><a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
>>>>>>> b0f1d61a312d4c7ba53fcc88f6648f890c71c694
{% endfor %}
</ul>
<hr />
Expand All @@ -86,7 +71,7 @@ <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.baseurl }}/
</footer>
</div><!-- /.footer-wrap -->

{% include _scripts.html %}
{% include _scripts.html %}

</body>
</html>
Loading

0 comments on commit b3fef2d

Please sign in to comment.