Skip to content

Commit

Permalink
Remove all instances of relative_url until GitHub pages problem is fi…
Browse files Browse the repository at this point in the history
…xed.

I am in email thread with GitHub support about what is happening here.
  • Loading branch information
JoelMarcey committed Nov 15, 2016
1 parent 91300d0 commit 2ef92fe
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
8 changes: 4 additions & 4 deletions docs/_includes/blog_pagination.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<br />
<div class="pagination">
{% if paginator.previous_page %}
<a href="{{ paginator.previous_page_path | relative_url | replace: '//', '/' }}">&laquo; Prev</a>
<a href="{{ paginator.previous_page_path | replace: '//', '/' }}">&laquo; Prev</a>
{% else %}
<span>&laquo; Prev</span>
{% endif %}
Expand All @@ -12,14 +12,14 @@
{% if page == paginator.page %}
<em>{{ page }}</em>
{% elsif page == 1 %}
<a href="{{ '/blog' | relative_url }}">{{ page }}</a>
<a href="{{ '/blog' }}">{{ page }}</a>
{% else %}
<a href="{{ site.paginate_path | relative_url | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
<a href="{{ site.paginate_path | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
{% endif %}
{% endfor %}

{% if paginator.next_page %}
<a href="{{ paginator.next_page_path | relative_url | replace: '//', '/' }}">Next &raquo;</a>
<a href="{{ paginator.next_page_path | replace: '//', '/' }}">Next &raquo;</a>
{% else %}
<span>Next &raquo;</span>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/header.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="headerContainer">
<div id="header_wrap" class="wrapper headerWrapper">
<div class="inner">
<img class="projectLogo" height="200px" src="{{ '/static/logo.svg' | relative_url }}" alt="{{ site.title }}" title="{{ site.title }}" />
<img class="projectLogo" height="200px" src="{{ '/static/logo.svg' }}" alt="{{ site.title }}" title="{{ site.title }}" />
<h1 id="project_title">{{ site.title }}</h1>
<h2 id="project_tagline" class="fbossFontLight">{{ site.tagline }}</h2>

Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/home_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2 id="project_tagline">{{ site.tagline }}</h2>
</div>
</div>
<div class="projectLogo">
<img src="{{ '/static/logo.svg' | relative_url }}" alt="{{ site.title }}">
<img src="{{ '/static/logo.svg' }}" alt="{{ site.title }}">
</div>
</div>
</div>
Expand Down
9 changes: 7 additions & 2 deletions docs/_includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="headerWrapper wrapper">
<header>
<a href="{{ '/' | absolute_url }}">
<img src="{{ '/static/logo.svg' | relative_url }}">
<img src="{{ '/static/logo.svg' }}">
<h2>{{ site.title }}</h2>
</a>

Expand All @@ -14,7 +14,12 @@ <h2>{{ site.title }}</h2>
{% if item.category == "external" %}
<a href="{{ item.href }}">{{ item.title }}</a>
{% else %}
<a href="{{ item.href | relative_url }}">{{ item.title }}</a>
{% comment %}
I removed `relative_url` from here for now until the problem we are having with
GitHub pages is resolved. Yes, I know this is exactly the same as the if above.
See: https://github.com/facebook/rocksdb/commit/800e51553ee029f29581f7f338cbc988c7f6da62
{% endcomment %}
<a href="{{ item.href }}">{{ item.title }}</a>
{% endif %}
</li>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion docs/blog/all.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>All Posts</h1>
{% assign author = site.data.authors[post.author] %}
<p>
<strong>
<a href="{{ post.url | relative_url }}">{{ post.title }}</a>
<a href="{{ post.url }}">{{ post.title }}</a>
</strong>
on {{ post.date | date: "%B %e, %Y" }} by {{ author.display_name }}
</p>
Expand Down
20 changes: 10 additions & 10 deletions docs/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,40 @@

@font-face {
font-family: 'Lato';
src: url("{{ '/static/fonts/LatoLatin-Italic.woff2' | relative_url }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Italic.woff' | relative_url }}") format('woff');
src: url("{{ '/static/fonts/LatoLatin-Italic.woff2' }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Italic.woff' }}") format('woff');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'Lato';
src: url("{{ '/static/fonts/LatoLatin-Black.woff2' | relative_url }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Black.woff' | relative_url }}") format('woff');
src: url("{{ '/static/fonts/LatoLatin-Black.woff2' }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Black.woff' }}") format('woff');
font-weight: 900;
font-style: normal;
}

@font-face {
font-family: 'Lato';
src: url("{{ '/static/fonts/LatoLatin-BlackItalic.woff2' | relative_url }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-BlackItalic.woff' | relative_url }}") format('woff');
src: url("{{ '/static/fonts/LatoLatin-BlackItalic.woff2' }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-BlackItalic.woff' }}") format('woff');
font-weight: 900;
font-style: italic;
}

@font-face {
font-family: 'Lato';
src: url("{{ '/static/fonts/LatoLatin-Light.woff2' | relative_url }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Light.woff' | relative_url }}") format('woff');
src: url("{{ '/static/fonts/LatoLatin-Light.woff2' }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Light.woff' }}") format('woff');
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Lato';
src: url("{{ '/static/fonts/LatoLatin-Regular.woff2' | relative_url }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Regular.woff' | relative_url }}") format('woff');
src: url("{{ '/static/fonts/LatoLatin-Regular.woff2' }}") format('woff2'),
url("{{ '/static/fonts/LatoLatin-Regular.woff' }}") format('woff');
font-weight: normal;
font-style: normal;
}
Expand Down

0 comments on commit 2ef92fe

Please sign in to comment.