light URL problem, better layout

reeco-framework · Oct 13, 2021 · 02d4c4b · 02d4c4b
1 parent 6473197
commit 02d4c4b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/_layouts/component.html b/_layouts/component.html
@@ -2,6 +2,8 @@
 layout: default
 ---
 
+{{ content }}
+
 <div class="tags"> 
   id: {{ page.id }} <br/>
   persona: {{ page.persona }} <br/>
@@ -14,4 +16,3 @@
 
 
 </div>
-{{ content }}
diff --git a/_layouts/story.html b/_layouts/story.html
@@ -2,6 +2,8 @@
 layout: default
 ---
 
+{{ content }}
+
 <div class="tags"> 
   id: {{ page.id }} <br/>
   persona: {{ page.persona }} <br/>
@@ -14,4 +16,3 @@
 
 
 </div>
-{{ content }}
diff --git a/pages/external-components.md b/pages/external-components.md
@@ -9,7 +9,7 @@ permalink: /external-components.html
     <h2>External components</h2>
     <ul>
     {% for comp in site.external-components %}
-    <li><a href="{{ site.baseurl }}{{ comp.url }}">
+    <li><a href="{{ comp.url | relative_url }}">
     {{ comp.path }} ({{ comp.name }})
         </a></li>
     {% endfor %}

diff --git a/pages/rulebook.md b/pages/rulebook.md
@@ -9,7 +9,7 @@ permalink: /rulebook.html
     <h2>Rulebook</h2>
     <ul>
     {% for file in site.rulebook %}
-    <li><a href="{{ site.baseurl }}{{ file.url }}">
+    <li><a href="{{ file.url | relative_url }}">
         {{ file.id | replace: "/rulebook/", ""  }}
         </a></li>
     {% endfor %}

diff --git a/pages/stories.md b/pages/stories.md
@@ -9,7 +9,7 @@ permalink: /stories.html
     <h2>Stories</h2>
     <ul>
     {% for story in site.stories %}
-    <li><a href="{{ site.baseurl }}{{ story.url }}">
+    <li><a href="{{ story.url | relative_url}}">
         {{ story.persona }} ({{ story.title }})
         </a></li>
     {% endfor %}