Merge pull request #9 from piazzai/hotfix

Fix relative urls
piazzai · Apr 3, 2024 · b3adbe7 · b3adbe7
2 parents e1e4418 + 7c21017
commit b3adbe7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/_layouts/404.html b/_layouts/404.html
@@ -2,8 +2,10 @@
 layout: default
 ---
 
+{% assign return = site.url | append: site.baseurl | split: '//' | slice: 1 -%}
+
 <div class="error">
     <h1>404</h1>
     <p>Page not found</p>
-    <p class="mt"><a href="{{ site.url }}">{{ site.url | split: "//" | slice: 1 }}</a></p>
+    <p class="mt"><a href="{{ site.url | append: site.baseurl }}">{{ return }}</a></p>
 </div>
diff --git a/demo/Gemfile b/demo/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'hacked-jekyll', '~> 2.1'
+gem 'hacked-jekyll', '~> 2.1', '>= 2.1.1'
diff --git a/demo/_config.yml b/demo/_config.yml
@@ -1,7 +1,7 @@
 title: Hacked Jekyll
 description: Jekyll microtheme that looks like JSON
-baseurl: ""
-url: https://piazzai.github.io/hacked-jekyll
+baseurl: /hacked-jekyll
+url: https://piazzai.github.io
 
 theme: hacked-jekyll
 

diff --git a/docs/404.html b/docs/404.html
@@ -23,15 +23,15 @@
 {"@context":"https://schema.org","@type":"WebPage","description":"Jekyll microtheme that looks like JSON","headline":"Hacked Jekyll","url":"https://piazzai.github.io/hacked-jekyll/404.html"}</script>
 <!-- End Jekyll SEO tag -->
 
-  <link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png">
-  <link rel="manifest" href="/assets/site.webmanifest">
-  <link rel="stylesheet" href="/assets/css/normalize.css" />
-  <link rel="stylesheet" href="/assets/css/open-color.css" />
-  <link rel="stylesheet" href="/assets/css/styles.css" />
-  <script src="/assets/js/typed.umd.js"></script>
+  <link rel="icon" type="image/x-icon" href="/hacked-jekyll/assets/favicon.ico" />
+  <link rel="apple-touch-icon" sizes="180x180" href="/hacked-jekyll/assets/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/hacked-jekyll/assets/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/hacked-jekyll/assets/favicon-16x16.png">
+  <link rel="manifest" href="/hacked-jekyll/assets/site.webmanifest">
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/normalize.css" />
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/open-color.css" />
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/styles.css" />
+  <script src="/hacked-jekyll/assets/js/typed.umd.js"></script>
 </head>
 
 <body>

diff --git a/docs/index.html b/docs/index.html
@@ -23,15 +23,15 @@
 {"@context":"https://schema.org","@type":"WebSite","description":"Jekyll microtheme that looks like JSON","headline":"Hacked Jekyll","name":"Hacked Jekyll","url":"https://piazzai.github.io/hacked-jekyll/"}</script>
 <!-- End Jekyll SEO tag -->
 
-  <link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png">
-  <link rel="manifest" href="/assets/site.webmanifest">
-  <link rel="stylesheet" href="/assets/css/normalize.css" />
-  <link rel="stylesheet" href="/assets/css/open-color.css" />
-  <link rel="stylesheet" href="/assets/css/styles.css" />
-  <script src="/assets/js/typed.umd.js"></script>
+  <link rel="icon" type="image/x-icon" href="/hacked-jekyll/assets/favicon.ico" />
+  <link rel="apple-touch-icon" sizes="180x180" href="/hacked-jekyll/assets/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/hacked-jekyll/assets/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/hacked-jekyll/assets/favicon-16x16.png">
+  <link rel="manifest" href="/hacked-jekyll/assets/site.webmanifest">
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/normalize.css" />
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/open-color.css" />
+  <link rel="stylesheet" href="/hacked-jekyll/assets/css/styles.css" />
+  <script src="/hacked-jekyll/assets/js/typed.umd.js"></script>
 </head>
 
 <body>
@@ -54,7 +54,7 @@
 
   <div class="my ms">
     "<span class="key">CV</span>":
-    "<a class="value" href="/cv.pdf" target="_self">cv.pdf</a>",
+    "<a class="value" href="/hacked-jekyll/cv.pdf" target="_self">cv.pdf</a>",
   </div>
 
   <div class="my ms">

diff --git a/hacked-jekyll.gemspec b/hacked-jekyll.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "hacked-jekyll"
-  spec.version       = "2.1.0"
+  spec.version       = "2.1.1"
   spec.authors       = ["piazzai"]
   spec.email         = ["[email protected]"]