Skip to content

Commit

Permalink
Fix relative links again
Browse files Browse the repository at this point in the history 
link in Jekyll 3.x needs baseurl :-(

Otherwise it doesn't work in forked repos like https://liskin.github.io/xmonad-web/
  • Loading branch information
@liskin
liskin committed Jun 7, 2021
1 parent 8b4035a commit 976bf24
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 18 deletions.
1 change: 0 additions & 1 deletion _config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
url: "https://xmonad.org"
title: "xmonad - the tiling window manager that rocks"
twitter:
username: xmonad
Expand Down
20 changes: 10 additions & 10 deletions _layouts/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="{% link css/bootstrap.min.css %}">
<link rel="stylesheet" href="{% link css/main.css %}">
<link rel="stylesheet" href="{{ site.baseurl }}{% link css/bootstrap.min.css %}">
<link rel="stylesheet" href="{{ site.baseurl }}{% link css/main.css %}">

{% seo %}
{% feed_meta %}
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-light">
<a class="mfont-weight-normal navbar-brand" href="{% link index.html %}">
<img src="{% link images/xmonad-logo.png %}" class="logo" alt="xmonad logo" id="xmonadLogo">
<a class="mfont-weight-normal navbar-brand" href="{{ site.baseurl }}{% link index.html %}">
<img src="{{ site.baseurl }}{% link images/xmonad-logo.png %}" class="logo" alt="xmonad logo" id="xmonadLogo">
</a>
<div class="mr-auto">
<h4>xmonad</h4>
Expand All @@ -29,23 +29,23 @@ <h5 class="quote">“That was easy. xmonad rocks!”</h5>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="{% link index.html %}">Home</a>
<a class="nav-link" href="{{ site.baseurl }}{% link index.html %}">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% link documentation.md %}">Documentation</a>
<a class="nav-link" href="{{ site.baseurl }}{% link documentation.md %}">Documentation</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% link download.md %}">Download</a>
<a class="nav-link" href="{{ site.baseurl }}{% link download.md %}">Download</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% link community.md %}">Community</a>
<a class="nav-link" href="{{ site.baseurl }}{% link community.md %}">Community</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% link posts.html %}">News/Blog</a>
<a class="nav-link" href="{{ site.baseurl }}{% link posts.html %}">News/Blog</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/xmonad/xmonad">
<img src="{% link images/GitHub-Mark-32px.png %}" class="github-logo" alt="github logo">
<img src="{{ site.baseurl }}{% link images/GitHub-Mark-32px.png %}" class="github-logo" alt="github logo">
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion css/font-raleway.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
font-family: "Raleway";
font-style: normal;
font-weight: 400;
src: local("Raleway"), local("Raleway-Regular"), url({% link fonts/Raleway.ttf %}) format("truetype");
src: local("Raleway"), local("Raleway-Regular"), url({{ site.baseurl }}{% link fonts/Raleway.ttf %}) format("truetype");
}
2 changes: 1 addition & 1 deletion css/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
---
@import "{% link css/font-raleway.css %}";
@import "{{ site.baseurl }}{% link css/font-raleway.css %}";

.navbar.my-bg {
background-color: white;
Expand Down
6 changes: 3 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ <h1 class="mb-3 bd-text-purple-bright name">XMonad</h1>
makes work easier, by automating this.
</p>
<div class="d-flex flex-column flex-md-row lead mb-3">
<p><a href="{% link tour.md %}" class="btn btn-lg btn-bd-purple mb-3 mb-md-0 mr-md-3" role="button">
<p><a href="{{ site.baseurl }}{% link tour.md %}" class="btn btn-lg btn-bd-purple mb-3 mb-md-0 mr-md-3" role="button">
Getting Started
</a></p>
<p><a href="{% link documentation.md %}" class="btn btn-lg btn-outline-secondary">
<p><a href="{{ site.baseurl }}{% link documentation.md %}" class="btn btn-lg btn-outline-secondary">
Documentation
</a></p>
</div>
Expand Down Expand Up @@ -74,7 +74,7 @@ <h3 id="whats-new">What’s new?</h3>
<ul>
{% for post in site.categories["news"] limit:3 %}
<li>
<a href="{{ post.url }}">{{ post.title }}.</a>
<a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}.</a>
{{ post.excerpt | remove: "<p>" | remove: "</p>" }}
<span class="text-muted">({{ post.date | date: "%Y-%m-%d" }})</span>
</li>
Expand Down
2 changes: 1 addition & 1 deletion news/_posts/2018-09-30-xmonad-0-15.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# xmonad 0.15 is available

Check out our [download page]({% link download.md %}).
Check out our [download page]({{ site.baseurl }}{% link download.md %}).
2 changes: 1 addition & 1 deletion posts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% for post in site.posts %}
<article>
<h2><a href="{{ post.url }}"><small class="text-muted">{{ post.date | date: "%Y-%m-%d" }}</small><br>{{ post.title }}</a></h2>
<h2><a href="{{ site.baseurl }}{{ post.url }}"><small class="text-muted">{{ post.date | date: "%Y-%m-%d" }}</small><br>{{ post.title }}</a></h2>
{{ post.excerpt }}
</article>
{% endfor %}

0 comments on commit 976bf24

Please sign in to comment.