Skip to content

Commit 56593ba

Browse files
csekelcsekel
authored
Merge pull request #18 from KevDoy/master
Standardize navigation between Homepage and Wiki
2 parents cd4002e + 145e968 commit 56593ba

File tree

3 files changed

+122
-41
lines changed

3 files changed

+122
-41
lines changed

‎index.html‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,25 @@
3535
<span class="me-auto"></span>
3636
<ul class="navbar-nav mb-2 mb-lg-0">
3737
<li class="nav-item">
38-
<a class="nav-link" aria-current="page" href="/wiki#/about/_About">About</a>
38+
<a class="nav-link" href="/">Home</a>
3939
</li>
4040
<li class="nav-item">
41-
<a class="nav-link" href="#beta">Download</a>
41+
<a class="nav-link" href="/wiki">Docs</a>
42+
</li>
43+
<li class="nav-item">
44+
<a class="nav-link" href="/wiki#/about/_About">About</a>
4245
</li>
4346
<li class="nav-item">
44-
<a class="nav-link" href="/wiki">Documentation</a>
47+
<a class="nav-link" href="/wiki#/developers/_Developers">Developers</a>
4548
</li>
4649
<li class="nav-item">
47-
<a class="nav-link" href="status.html">Status</a>
50+
<a class="nav-link" href="/wiki#/users/_Users">Users</a>
4851
</li>
4952
<li class="nav-item">
50-
<a class="nav-link"
51-
href="/wiki#/about/_About?id=frequently-asked-questions">FAQ</a>
53+
<a class="nav-link" href="/wiki#/news/_News">News</a>
54+
</li>
55+
<li class="nav-item">
56+
<a class="nav-link" href="#beta">Download</a>
5257
</li>
5358
<li class="nav-item">
5459
<a class="nav-link" href="https://github.com/pureDarwin/" target="_blank">GitHub</a>
@@ -191,7 +196,6 @@ <h3>Community</h3>
191196
<h3>Status</h3>
192197
<p>PureDarwin is progressing steadily, with ongoing research behind the scenes. There's no GUI yet, and
193198
the system remains minimal, but key foundations are being built for future updates.</p>
194-
<a href="status.html" class="btn btn-outline-primary rounded-pill btn-sm mb-2">Status Page</a>
195199
</div>
196200
</div>
197201
</div>

‎wiki/_navbar.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
- [About](/about/_About)
44
- [Developers](/developers/_Developers)
55
- [Users](/users/_Users)
6-
- [News](/news/_News)
6+
- [News](/news/_News)
7+
- [Download](https://www.puredarwin.org/#beta)
8+
- [GitHub](https://github.com/pureDarwin/)

‎wiki/index.html‎

Lines changed: 108 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,111 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<title> PureDarwin Wiki </title>
6-
<link rel="icon" href="/img/PureDarwin.png" />
7-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css" />
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/light.css">
9-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
10-
</head>
11-
12-
<body>
13-
14-
<div id="app"></div>
15-
<script>
16-
window.$docsify = {
17-
homepage: "Home.md",
18-
auto2top: true,
19-
loadNavbar: true,
20-
loadSidebar: true,
21-
relativePath: true,
22-
alias: { "/.*/_navbar.md": "/_navbar.md", "/_sidebar.md": "/_navbar.md" },
23-
markdown: {
24-
renderer: { image: (href, title) => `<img src="${href}" data-origin="${href}" alt="${title}">` }
25-
},
26-
toc: {
27-
tocMaxLevel: 3,
28-
target: "h2, h3, h4, h5, h6",
29-
ignoreHeaders: ["<!-- {docsify-ignore} -->", "<!-- {docsify-ignore-all} -->"]
30-
}
3+
4+
<head>
5+
<meta charset="UTF-8" />
6+
<title> PureDarwin Wiki </title>
7+
<link rel="icon" href="/img/PureDarwin.png" />
8+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css" />
9+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/light.css">
10+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
11+
integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
12+
13+
<style>
14+
.app-nav {
15+
margin: 0 0 20px 0;
16+
}
17+
18+
.app-nav.no-badge {
19+
margin-right: 0;
20+
}
21+
22+
.nav-link {
23+
display: block !important;
24+
padding: var(--bs-nav-link-padding-y) var(--bs-nav-link-padding-x) !important;
25+
font-size: var(--bs-nav-link-font-size) !important;
26+
font-weight: var(--bs-nav-link-font-weight) !important;
27+
color: var(--bs-nav-link-color) !important;
28+
text-decoration: none !important;
29+
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !important;
30+
}
31+
32+
.content {
33+
margin-top: 30px;
34+
}
35+
36+
.sidebar {
37+
margin-top: 40px;
38+
}
39+
</style>
40+
41+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
42+
</head>
43+
44+
<body>
45+
<nav class="navbar navbar-dark navbar-expand-lg fixed-top bg-black" style="z-index: 9999;">
46+
<div class="container">
47+
<a class="navbar-brand" href="/">
48+
<img src="../img/homepage/logo-mark-text-fff.svg" alt="PureDarwin" height="30px" class="pb-1">
49+
</a>
50+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText"
51+
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
52+
<span class="navbar-toggler-icon"></span>
53+
</button>
54+
<div class="collapse navbar-collapse" id="navbarText">
55+
<span class="me-auto"></span>
56+
<ul class="navbar-nav mb-2 mb-lg-0">
57+
<li class="nav-item">
58+
<a class="nav-link" href="/">Home</a>
59+
</li>
60+
<li class="nav-item">
61+
<a class="nav-link" href="/wiki">Docs</a>
62+
</li>
63+
<li class="nav-item">
64+
<a class="nav-link" href="/wiki#/about/_About">About</a>
65+
</li>
66+
<li class="nav-item">
67+
<a class="nav-link" href="/wiki#/developers/_Developers">Developers</a>
68+
</li>
69+
<li class="nav-item">
70+
<a class="nav-link" href="/wiki#/users/_Users">Users</a>
71+
</li>
72+
<li class="nav-item">
73+
<a class="nav-link" href="/wiki#/news/_News">News</a>
74+
</li>
75+
<li class="nav-item">
76+
<a class="nav-link" href="/#beta">Download</a>
77+
</li>
78+
<li class="nav-item">
79+
<a class="nav-link" href="https://github.com/pureDarwin/" target="_blank">GitHub</a>
80+
</li>
81+
</ul>
82+
</div>
83+
</div>
84+
</div>
85+
</nav>
86+
<div id="app"></div>
87+
<script>
88+
window.$docsify = {
89+
homepage: "Home.md",
90+
auto2top: true,
91+
loadSidebar: true,
92+
relativePath: true,
93+
alias: { "/.*/_navbar.md": "/_navbar.md", "/_sidebar.md": "/_navbar.md" },
94+
markdown: {
95+
renderer: { image: (href, title) => `<img src="${href}" data-origin="${href}" alt="${title}">` }
96+
},
97+
toc: {
98+
tocMaxLevel: 3,
99+
target: "h2, h3, h4, h5, h6",
100+
ignoreHeaders: ["<!-- {docsify-ignore} -->", "<!-- {docsify-ignore-all} -->"]
31101
}
32-
</script>
33-
<script src="https://cdn.jsdelivr.net/npm/docsify@4"></script>
34-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/docsify-plugin-toc.min.js"></script>
35-
</body>
36-
</html>
102+
}
103+
</script>
104+
<script src="https://cdn.jsdelivr.net/npm/docsify@4"></script>
105+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/docsify-plugin-toc.min.js"></script>
106+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
107+
integrity="sha384-pprn3073KE6tl6bjs2QrFaJGz5/SUsLqktiwsUTF55Jfv3qYSDhgCecCxMW52nD2"
108+
crossorigin="anonymous"></script>
109+
</body>
110+
111+
</html>

0 commit comments

Comments
 (0)