More Jekyll 3.3 fixes

This commit is contained in:
Joel Marcey 2016-11-07 16:16:05 -08:00
parent c54cdc3784
commit f1aedda068
7 changed files with 18 additions and 19 deletions

View File

@ -21,5 +21,5 @@
<base href="{{ absolute_url }}/" /> <base href="{{ absolute_url }}/" />
<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}"> <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | absolute_url }}" /> <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | absolute_url }}" />
</head> </head>

View File

@ -1,7 +1,7 @@
<div class="headerContainer"> <div class="headerContainer">
<div id="header_wrap" class="wrapper headerWrapper"> <div id="header_wrap" class="wrapper headerWrapper">
<div class="inner"> <div class="inner">
<img class="projectLogo" height="200px" src="{{ relative_url }}/static/logo.svg" alt="{{ site.title }}" title="{{ site.title }}" /> <img class="projectLogo" height="200px" src="{{ '/static/logo.svg' | relative_url }}" alt="{{ site.title }}" title="{{ site.title }}" />
<h1 id="project_title">{{ site.title }}</h1> <h1 id="project_title">{{ site.title }}</h1>
<h2 id="project_tagline" class="fbossFontLight">{{ site.tagline }}</h2> <h2 id="project_tagline" class="fbossFontLight">{{ site.tagline }}</h2>

View File

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="projectLogo"> <div class="projectLogo">
<img src="{{ relative_url }}/static/logo.svg" alt="{{ site.title }}"> <img src="{{ '/static/logo.svg' | relative_url }}" alt="{{ site.title }}">
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,8 +1,8 @@
<div id="fixed_header" class="fixedHeaderContainer{% if include.alwayson %} visible{% endif %}"> <div id="fixed_header" class="fixedHeaderContainer{% if include.alwayson %} visible{% endif %}">
<div class="headerWrapper wrapper"> <div class="headerWrapper wrapper">
<header> <header>
<a href="{{ absolute_url }}/"> <a href="{{ '/' | absolute_url }}">
<img src="{{ relative_url }}/static/logo.svg"> <img src="{{ '/static/logo.svg' | relative_url }}">
<h2>{{ site.title }}</h2> <h2>{{ site.title }}</h2>
</a> </a>
@ -11,7 +11,7 @@
<ul> <ul>
{% for item in site.data.nav %} {% for item in site.data.nav %}
<li class="navItem{% if page.collection == item.category or page.category == item.category %} navItemActive{% endif %}"> <li class="navItem{% if page.collection == item.category or page.category == item.category %} navItemActive{% endif %}">
<a href="{{ item.href }}">{{ item.title }}</a> <a href="{{ item.href | absolute_url }}">{{ item.title }}</a>
</li> </li>
{% endfor %} {% endfor %}
{% if site.searchconfig %} {% if site.searchconfig %}

View File

@ -62,4 +62,3 @@
} }
} }
</script> </script>

View File

@ -1 +1 @@
<li class="navListItem"><a class="navItem" href="{{ groupitem.url }}">{{ groupitem.title }}</a></li> <li class="navListItem"><a class="navItem" href="{{ groupitem.url | absolute_url }}">{{ groupitem.title }}</a></li>

View File

@ -5,40 +5,40 @@
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: url('{{ relative_url }}/static/fonts/LatoLatin-Italic.woff2') format('woff2'), src: url("{{ '/static/fonts/LatoLatin-Italic.woff2' | relative_url }}") format('woff2'),
url('{{ relative_url }}/static/fonts/LatoLatin-Italic.woff') format('woff'); url("{{ '/static/fonts/LatoLatin-Italic.woff' | relative_url }}") format('woff');
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: url('{{ relative_url }}/static/fonts/LatoLatin-Black.woff2') format('woff2'), src: url("{{ '/static/fonts/LatoLatin-Black.woff2' | relative_url }}") format('woff2'),
url('{{ relative_url }}/static/fonts/LatoLatin-Black.woff') format('woff'); url("{{ '/static/fonts/LatoLatin-Black.woff' | relative_url }}") format('woff');
font-weight: 900; font-weight: 900;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: url('{{ relative_url }}/static/fonts/LatoLatin-BlackItalic.woff2') format('woff2'), src: url("{{ '/static/fonts/LatoLatin-BlackItalic.woff2' | relative_url }}") format('woff2'),
url('{{ relative_url }}/static/fonts/LatoLatin-BlackItalic.woff') format('woff'); url("{{ '/static/fonts/LatoLatin-BlackItalic.woff' | relative_url }}") format('woff');
font-weight: 900; font-weight: 900;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: url('{{ relative_url }}/static/fonts/LatoLatin-Light.woff2') format('woff2'), src: url("{{ '/static/fonts/LatoLatin-Light.woff2' | relative_url }}") format('woff2'),
url('{{ relative_url }}/static/fonts/LatoLatin-Light.woff') format('woff'); url("{{ '/static/fonts/LatoLatin-Light.woff' | relative_url }}") format('woff');
font-weight: 300; font-weight: 300;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Lato'; font-family: 'Lato';
src: url('{{ relative_url }}/static/fonts/LatoLatin-Regular.woff2') format('woff2'), src: url("{{ '/static/fonts/LatoLatin-Regular.woff2' | relative_url }}") format('woff2'),
url('{{ relative_url }}/static/fonts/LatoLatin-Regular.woff') format('woff'); url("{{ '/static/fonts/LatoLatin-Regular.woff' | relative_url }}") format('woff');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }