Skip to content

Commit 808ca63

Browse files
DeletecatDeletecat
committed
Revert base directory changes
These were required when hosted under a sub directory. As this site is no longer being hosted from a sub directory, these changes to the site are no longer required.
1 parent 0052290 commit 808ca63

12 files changed

Lines changed: 46 additions & 53 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Run Jekyll
2525
# Build the site using Jekyll
26-
run: JEKYLL_ENV=production bundle exec jekyll build --baseurl "/kernel-themes"
26+
run: JEKYLL_ENV=production bundle exec jekyll build
2727

2828
# Copy (or touch) other needed files
2929
# .nojekyll: to tell GH Pages to not rebuild (lol)

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# theme : jekyll-theme-slate
22
title : "Kernel Themes"
33
description : "A repository for flashcart kernel themes"
4-
repo : "Sanrax/kernel-themes"
4+
repo : "flashcarts/kernel-themes"
55
color : "#B23456"
66
image : "/assets/images/favicon/favicon-196x196.png"
77

‎_includes/common-js.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<script>loadLang(true);</script>
2-
<script src={{ "/assets/js/rescript.js" | relative_url }} type="module"></script>
2+
<script src="/assets/js/rescript.js" type="module"></script>
33
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>

‎_includes/favicon.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<link rel="apple-touch-icon-precomposed" sizes="57x57" href={{ "/assets/images/favicon/apple-touch-icon-57x57.png" | relative_url }} />
2-
<link rel="apple-touch-icon-precomposed" sizes="114x114" href={{ "/assets/images/favicon/apple-touch-icon-114x114.png" | relative_url }} />
3-
<link rel="apple-touch-icon-precomposed" sizes="72x72" href={{ "/assets/images/favicon/apple-touch-icon-72x72.png" | relative_url }} />
4-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href={{ "/assets/images/favicon/apple-touch-icon-144x144.png" | relative_url }} />
5-
<link rel="apple-touch-icon-precomposed" sizes="60x60" href={{ "/assets/images/favicon/apple-touch-icon-60x60.png" | relative_url }} />
6-
<link rel="apple-touch-icon-precomposed" sizes="120x120" href={{ "/assets/images/favicon/apple-touch-icon-120x120.png" | relative_url }} />
7-
<link rel="apple-touch-icon-precomposed" sizes="76x76" href={{ "/assets/images/favicon/apple-touch-icon-76x76.png" | relative_url }} />
8-
<link rel="apple-touch-icon-precomposed" sizes="152x152" href={{ "/assets/images/favicon/apple-touch-icon-152x152.png" | relative_url }} />
9-
<link rel="icon" type="image/png" href={{ "/assets/images/favicon/favicon-196x196.png" | relative_url }} sizes="196x196" />
10-
<link rel="icon" type="image/png" href={{ "/assets/images/favicon/favicon-96x96.png" | relative_url }} sizes="96x96" />
11-
<link rel="icon" type="image/png" href={{ "/assets/images/favicon/favicon-32x32.png" | relative_url }} sizes="32x32" />
12-
<link rel="icon" type="image/png" href={{ "/assets/images/favicon/favicon-16x16.png" | relative_url }} sizes="16x16" />
13-
<link rel="icon" type="image/png" href={{ "/assets/images/favicon/favicon-128.png" | relative_url }} sizes="128x128" />
1+
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/images/favicon/apple-touch-icon-57x57.png" />
2+
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/images/favicon/apple-touch-icon-114x114.png" />
3+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/images/favicon/apple-touch-icon-72x72.png" />
4+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/images/favicon/apple-touch-icon-144x144.png" />
5+
<link rel="apple-touch-icon-precomposed" sizes="60x60" href="/assets/images/favicon/apple-touch-icon-60x60.png" />
6+
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="/assets/images/favicon/apple-touch-icon-120x120.png" />
7+
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="/assets/images/favicon/apple-touch-icon-76x76.png" />
8+
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="/assets/images/favicon/apple-touch-icon-152x152.png" />
9+
<link rel="icon" type="image/png" href="/assets/images/favicon/favicon-196x196.png" sizes="196x196" />
10+
<link rel="icon" type="image/png" href="/assets/images/favicon/favicon-96x96.png" sizes="96x96" />
11+
<link rel="icon" type="image/png" href="/assets/images/favicon/favicon-32x32.png" sizes="32x32" />
12+
<link rel="icon" type="image/png" href="/assets/images/favicon/favicon-16x16.png" sizes="16x16" />
13+
<link rel="icon" type="image/png" href="/assets/images/favicon/favicon-128.png" sizes="128x128" />
1414
<meta name="application-name" content="{{ page.title}} | {{ site.title }}">
1515
<meta name="msapplication-TileColor" content="{{ page.color | default: site.color }}">
16-
<meta name="msapplication-TileImage" content={{ "/assets/images/favicon/mstile-144x144.png" | relative_url }} />
17-
<meta name="msapplication-square70x70logo" content={{ "/assets/images/favicon/mstile-70x70.png" | relative_url }} />
18-
<meta name="msapplication-square150x150logo" content={{ "/assets/images/favicon/mstile-150x150.png" | relative_url }} />
19-
<meta name="msapplication-wide310x150logo" content={{ "/assets/images/favicon/mstile-310x150.png" | relative_url }} />
20-
<meta name="msapplication-square310x310logo" content={{ "/assets/images/favicon/mstile-310x310.png" | relative_url }} />
16+
<meta name="msapplication-TileImage" content="/assets/images/favicon/mstile-144x144.png" />
17+
<meta name="msapplication-square70x70logo" content="/assets/images/favicon/mstile-70x70.png" />
18+
<meta name="msapplication-square150x150logo" content="/assets/images/favicon/mstile-150x150.png" />
19+
<meta name="msapplication-wide310x150logo" content="/assets/images/favicon/mstile-310x150.png" />
20+
<meta name="msapplication-square310x310logo" content="/assets/images/favicon/mstile-310x310.png" />

‎_includes/footer.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<div class="col-sm-10">
55
<p class="text-light">
66
<p class="text-light">By: <a href="https://github.com/flashcarts" class="link">flashcarts.net contributors</a> -
7-
<a href={{ "/license.html" | relative_url }} class="link">License Disclosure</a> -
7+
<a href="/license.html" class="link">License Disclosure</a> -
88
<br>
9-
<a href={{ "/contact.html" | relative_url }} class="link">Contact Us</a>
9+
<a href="/contact.html" class="link">Contact Us</a>
1010
</p>
1111
</div>
1212
<div class="col-sm-2">

‎_includes/head.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<link id="bootstrap-stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
1313

14-
<link id="theme-css" rel="stylesheet" type="text/css" media="screen" href={{ "/assets/css/style.css" | relative_url }}>
15-
<script src={{ "/assets/js/theme.js" | relative_url }}></script>
14+
<link id="theme-css" rel="stylesheet" type="text/css" media="screen" href="/assets/css/style.css">
15+
<script src="/assets/js/theme.js"></script>
1616

1717
{% if page.color_bg or page.color %}
1818
{% assign accent = page.color_bg | default: page.color %}
@@ -40,10 +40,10 @@
4040
</style>
4141
{% endif %}
4242

43-
<link rel="alternate" type="application/rss+xml" title="RSS Feed | {{ site.title }}" href={{ "/index.rss" | relative_url }}>
43+
<link rel="alternate" type="application/rss+xml" title="RSS Feed | {{ site.title }}" href="/index.rss">
4444

4545
{% include favicon.html %}
4646
{% include seo.html %}
4747

48-
<script src={{ "/assets/js/i18n.js" | relative_url }}></script>
48+
<script src="/assets/js/i18n.js"></script>
4949
</head>

‎_includes/nav.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
22
<div class="container-fluid maxwidth">
3-
<a class="navbar-brand" href={{ "/" | relative_url }} accesskey="h">{{ site.title }}</a>
3+
<a class="navbar-brand" href="/" accesskey="h">{{ site.title }}</a>
44
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
55
<span class="navbar-toggler-icon"></span>
66
</button>
@@ -9,15 +9,15 @@
99
{% for item in site.data.nav %}
1010
{% if item.url %}
1111
<li class="nav-item">
12-
<a class="nav-link {% if item.title == page.title %}active{% endif %} i18n innerHTML-{%if item.i18n %}{{ item.i18n }}{% else %}{{ item.title | downcase | replace: " ", "-" }}{% endif %}" href="{{ item.url | relative_url }}" {% if item.key %}accesskey="{{ item.key }}"{% endif %}>{{ item.title }}</a>
12+
<a class="nav-link {% if item.title == page.title %}active{% endif %} i18n innerHTML-{%if item.i18n %}{{ item.i18n }}{% else %}{{ item.title | downcase | replace: " ", "-" }}{% endif %}" href="{{ item.url }}" {% if item.key %}accesskey="{{ item.key }}"{% endif %}>{{ item.title }}</a>
1313
</li>
1414
{% elsif item.items %}
1515
<li class="nav-item dropdown">
1616
<a class="nav-link {% for entry in item.items %}{% if entry.page_title == page.title or page.systems contains item.title %}active{% break %}{% endif %}{% endfor %} dropdown-toggle i18n innerHTML-{%if item.i18n %}{{ item.i18n }}{% else %}{{ item.title | downcase | replace: " ", "-" }}{% endif %}" href="#" id="navbar-dropdown-menu-link-{{ item.title }}" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {% if item.key %}accesskey="{{ item.key }}"{% endif %}>{{ item.title }}</a>
1717
<div class="dropdown-menu hover-content" aria-labelledby="navbar-dropdown-menu-link-{{ item.title }}">
1818
<ul class="list-unstyled">
1919
{% for entry in item.items %}
20-
<li><a class="dropdown-item {% if entry.page_title == page.title %}active{% endif %} i18n innerHTML-{%if entry.i18n %}{{ entry.i18n }}{% else %}{{ entry.title | downcase | replace: " ", "-" }}{% endif %}" href="{{ entry.url | relative_url }}" {% if entry.key %}accesskey="{{ entry.key }}"{% endif %}>{{ entry.title }}</a></li>
20+
<li><a class="dropdown-item {% if entry.page_title == page.title %}active{% endif %} i18n innerHTML-{%if entry.i18n %}{{ entry.i18n }}{% else %}{{ entry.title | downcase | replace: " ", "-" }}{% endif %}" href="{{ entry.url }}" {% if entry.key %}accesskey="{{ entry.key }}"{% endif %}>{{ entry.title }}</a></li>
2121
{% endfor %}
2222
</ul>
2323
</div>

‎_layouts/app.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{% if page.website %}<a href="{{ page.website }}">{% elsif page.source %}<a href="{{ page.source }}">{% endif %}
2727
{% if page.images.size > 0 %}
2828
<div class="card-header">
29-
<img class="mx-auto d-block mw-100 app-image" src="{{ page.images[0].url | relative_url }}" alt="{{ page.images[0].description | default: page.title | escape }}">
29+
<img class="mx-auto d-block mw-100 app-image" src="{{ page.images[0].url }}" alt="{{ page.images[0].description | default: page.title | escape }}">
3030
</div>
3131
{% endif %}
3232
<div class="card-body" dir="ltr">
@@ -48,7 +48,7 @@ <h4 class="card-title text-center {% if page.creator %}mb-0{% endif %}">{{ page.
4848
<dd>
4949
{%- for category in page.categories -%}
5050
{%- assign cat = category | prepend: "cat-" -%}
51-
<a href="{{ site.baseurl }}/{{ page.collection }}/category/{{ category }}" class="i18n innerHTML-cat-{{ category }}">{{ site.data.i18n.en-US[cat] | default: category }}</a>{% if forloop.last == false %},{% endif %}
51+
<a href="/{{ page.collection }}/category/{{ category }}" class="i18n innerHTML-cat-{{ category }}">{{ site.data.i18n.en-US[cat] | default: category }}</a>{% if forloop.last == false %},{% endif %}
5252
{% endfor %}
5353
</dd>
5454
</div>
@@ -76,7 +76,7 @@ <h4 class="card-title text-center {% if page.creator %}mb-0{% endif %}">{{ page.
7676
<h2 class="i18n innerHTML-downloads">Downloads</h2>
7777
{% for item in page.downloads %}
7878
<span class="text-nowrap">
79-
<a class="btn btn-primary m-1 i18n innerHTML-download-name" {% if item[1].size_str %}title="Size: {{ item[1].size_str }}"{% endif %} href="{{ item[1].url | relative_url }}" data-name="{{ item[0] }}">Download {{ item[0] }}</a>
79+
<a class="btn btn-primary m-1 i18n innerHTML-download-name" {% if item[1].size_str %}title="Size: {{ item[1].size_str }}"{% endif %} href="{{ item[1].url }}" data-name="{{ item[0] }}">Download {{ item[0] }}</a>
8080
</span>
8181
{% endfor %}
8282
</div>
@@ -105,7 +105,7 @@ <h2 class="i18n innerHTML-images">Images</h2>
105105
<div class="carousel-inner">
106106
{% for img in page.images %}
107107
<div class="carousel-item mt-2 mb-2 {% if forloop.first %}active{% endif %}">
108-
<img src="{{ img.url | relative_url }}" class="d-block mx-auto app-image" alt="{{ img.description }}">
108+
<img src="{{ img.url }}" class="d-block mx-auto app-image" alt="{{ img.description }}">
109109
<div class="carousel-caption d-none d-md-block">
110110
<h5 class="carousel-label">{{ img.description }}</h5>
111111
</div>
@@ -135,6 +135,6 @@ <h5 class="carousel-label">{{ img.description }}</h5>
135135
{% include footer.html %}
136136

137137
{% include common-js.html %}
138-
<script src={{ "/assets/js/modal.js" | relative_url }}></script>
138+
<script src="/assets/js/modal.js"></script>
139139
</body>
140140
</html>

‎_layouts/cards.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<a class="flex-grow-1" href="{{ app.url | remove: ".html" | relative_url }}">
6868
{% if app.images.size > 0 %}
6969
<div class="card-header card-image-header">
70-
<img class="card-image" src="{{ app.images[0].url | relative_url }}" alt="{{ app.images[0].description | default: app.title | escape }}" loading="lazy">
70+
<img class="card-image" src="{{ app.images[0].url }}" alt="{{ app.images[0].description | default: app.title | escape }}" loading="lazy">
7171
</div>
7272
{% endif %}
7373
<div class="card-body" dir="ltr">
@@ -94,10 +94,10 @@ <h4 class="card-title text-center {% if app.creator %}mb-0{% endif %}">{{ app.ti
9494
{% include footer.html %}
9595

9696
{% include common-js.html %}
97-
<script src={{"/assets/js/search.js" | relative_url }}></script>
98-
<script src={{"/assets/js/modal.js" | relative_url}}></script>
97+
<script src="/assets/js/search.js"></script>
98+
<script src="/assets/js/modal.js"></script>
9999
{% if page.system %}
100-
<script src={{"/assets/js/sort.js" | relative_url}}></script>
100+
<script src="/assets/js/sort.js"></script>
101101
{% endif %}
102102
</body>
103-
</html>
103+
</html>

‎assets/js/theme.js‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
function loadTheme() {
22
const themeCSS = document.getElementById("theme-css");
33
if(!localStorage.theme || localStorage.theme == "default")
4-
if(window.location.href.indexOf("http://127.0.0.1") == 0 || window.location.href.indexOf("http://localhost") == 0){
5-
themeCSS.href = "/assets/css/style.css";
6-
}else{
7-
themeCSS.href = "/kernel-themes/assets/css/style.css";
8-
}
9-
4+
themeCSS.href = "/assets/css/style.css";
105
else
11-
if(window.location.href.indexOf("http://127.0.0.1") == 0 || window.location.href.indexOf("http://localhost") == 0)
12-
themeCSS.href = "/assets/css/" + localStorage.theme + ".css";
13-
else
14-
themeCSS.href = "/kernel-themes/assets/css/" + localStorage.theme + ".css";
6+
themeCSS.href = "/assets/css/" + localStorage.theme + ".css";
7+
158

169
}
1710

0 commit comments

Comments
 (0)