From 0bab82205400fb6ab809e32ee892e430c1287c54 Mon Sep 17 00:00:00 2001
From: xgui4 <134389196+xgui4@users.noreply.github.com>
Date: Sat, 28 Jun 2025 09:52:36 -0400
Subject: [PATCH] Update website content for Artix + added contributors list
 and navigation links for clarity and accessibility + info about the main
 developpement on the website

---
 website/README.md      |  6 +++---
 website/about.html     | 10 +++++-----
 website/css/styles.css | 21 ++++++++++++++-------
 website/drivers.html   | 10 +++++-----
 website/index.html     |  8 ++++----
 website/wiki.html      | 41 +++++++++++++++++++++++++++++------------
 6 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/website/README.md b/website/README.md
index 7ab94e747..395ad63dc 100644
--- a/website/README.md
+++ b/website/README.md
@@ -1,6 +1,6 @@
 # x11libre-website
 
-A website for the X11Libre project by @metux
+A website for the X11Libre (A fork of [Xorg XServer](https://gitlab.freedesktop.org/xorg/xserver)) project by @metux and the contributors
 
 ## About
 
@@ -28,6 +28,6 @@ This project is licensed under the MIT License.
 
 ## Contact
 
-For questions or contributions, please open an issue or contact @metux.
+For questions or contributions, please open an issue or contact [@metux](https://github.com/metux).
 
-### Made by [@xgui4](https://github.com/xgui4) and [@ChocodeerZyNX](https://github.com/ChocodeerZyNX)
\ No newline at end of file
+### Made by [@xgui4](https://github.com/xgui4) and [@ChocodeerZyNX](https://github.com/ChocodeerZyNX) and [@yusi1](https://github.com/yuzi1)
\ No newline at end of file
diff --git a/website/about.html b/website/about.html
index 305215a35..501f9ba56 100644
--- a/website/about.html
+++ b/website/about.html
@@ -19,7 +19,7 @@
         <nav class="navbar navbar-expand-lg bg-body-tertiary">
             <div class="container-fluid">
                 <img src="img/XLibre-Logo.svg" alt="Bootstrap" width="90" height="90">
-                <a class="navbar-brand" href="#">X11Libre X Server</a>
+                <a class="navbar-brand" href="index.html">X11Libre X Server</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                     data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
                     aria-expanded="false" aria-label="Toggle navigation">
@@ -28,16 +28,16 @@
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page" href="index.html">Home</a>
+                            <a class="nav-link" aria-current="page" href="index.html">Home</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="drivers.html">Drivers</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="about.html">About</a>
+                            <a class="nav-link active" href="about.html">About</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-itme" href="wiki.html">Wiki</a>
+                            <a class="nav-link" href="wiki.html">Wiki</a>
                         </li>
                     </ul>
                 </div>
@@ -75,4 +75,4 @@
          </div>
       </div>
 </footer>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/css/styles.css b/website/css/styles.css
index 69ac34167..ffec61f45 100644
--- a/website/css/styles.css
+++ b/website/css/styles.css
@@ -81,9 +81,13 @@ a {
 }
 
 /* general layout */
+main {
+    margin: 20px 20px 20px 20px;
+}
+
 #main-content {
     width: 97%;
-    margin: 0 auto;
+    margin: 20px 20px 20px 20px;
     text-align: left;
 }
 
@@ -98,8 +102,8 @@ a {
 
 #content-right {
     float: left;
-    width: 300px;
-    margin-left: -300px;
+    width: 100%;
+    /* margin-left: -300px; */
 }
 
 div.nav-border {
@@ -115,6 +119,12 @@ div.nav-border {
     padding: 0;
 }
 
+/* highlight Wiki link in navbar */
+.navbar-nav > li:nth-child(4) {
+    text-decoration: underline;
+    text-decoration-color: #78b2c3;
+}
+
 .right {
 	float: right;
 	margin: 0;
@@ -153,10 +163,7 @@ div.quicklink {
 	border-right: 1px dotted #ccc;
 	width: 200px;
    overflow: auto;
-}
-
-div.install {
-   margin-left: 200px;
+   margin-right: 30px;
 }
 
 /* responsive */
diff --git a/website/drivers.html b/website/drivers.html
index 8287c4434..188b1057e 100644
--- a/website/drivers.html
+++ b/website/drivers.html
@@ -15,7 +15,7 @@
      <nav class="navbar navbar-expand-lg bg-body-tertiary">
       <div class="container-fluid">
         <img src="img/XLibre-Logo.svg" alt="Bootstrap" width="90" height="90">
-        <a class="navbar-brand" href="#">X11Libre X Server</a>
+        <a class="navbar-brand" href="index.html">X11Libre X Server</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
           aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
@@ -23,16 +23,16 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav me-auto mb-2 mb-lg-0">
             <li class="nav-item">
-              <a class="nav-link active" aria-current="page" href="#">Home</a>
+              <a class="nav-link" aria-current="page" href="index.html">Home</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="drivers.html">Drivers</a>
+              <a class="nav-link active" href="drivers.html">Drivers</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="about.html">About</a>
             </li>
             <li class="nav-item">
-              <a class="nav-itme" href="wiki.html">Wiki</a>
+              <a class="nav-link" href="wiki.html">Wiki</a>
             </li>
           </ul>
         </div>
@@ -119,4 +119,4 @@
          </div>
       </div>
 </footer>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/index.html b/website/index.html
index 7ba1a540c..077282ec5 100644
--- a/website/index.html
+++ b/website/index.html
@@ -19,7 +19,7 @@
     <nav class="navbar navbar-expand-lg bg-body-tertiary">
       <div class="container-fluid">
         <img src="img/XLibre-Logo.svg" alt="Bootstrap" width="90" height="90">
-        <a class="navbar-brand" href="#">X11Libre X Server</a>
+        <a class="navbar-brand" href="index.html">X11Libre X Server</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
           aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
@@ -27,7 +27,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav me-auto mb-2 mb-lg-0">
             <li class="nav-item">
-              <a class="nav-link active" aria-current="page" href="#">Home</a>
+              <a class="nav-link active" aria-current="page" href="index.html">Home</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="drivers.html">Drivers</a>
@@ -36,7 +36,7 @@
                 <a class="nav-link" href="about.html">About</a>
             </li>
             <li class="nav-item">
-              <a class="nav-itme" href="wiki.html">Wiki</a>
+              <a class="nav-link" href="wiki.html">Wiki</a>
             </li>
           </ul>
         </div>
@@ -123,4 +123,4 @@
          </div>
       </div>
 </footer>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/wiki.html b/website/wiki.html
index 821e83831..5a697568d 100644
--- a/website/wiki.html
+++ b/website/wiki.html
@@ -16,7 +16,7 @@
      <nav class="navbar navbar-expand-lg bg-body-tertiary">
       <div class="container-fluid">
         <img src="img/XLibre-Logo.svg" alt="Bootstrap" width="90" height="90">
-        <a class="navbar-brand" href="#">X11Libre X Server</a>
+        <a class="navbar-brand" href="index.html">X11Libre X Server</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
           aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
@@ -24,7 +24,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav me-auto mb-2 mb-lg-0">
             <li class="nav-item">
-              <a class="nav-link active" aria-current="page" href="index.html">Home</a>
+              <a class="nav-link" aria-current="page" href="index.html">Home</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="drivers.html">Drivers</a>
@@ -33,7 +33,7 @@
                 <a class="nav-link" href="about.html">About</a>
             </li>
             <li class="nav-item">
-                <a class="nav-itme" href="wiki.html">Wiki</a>
+                <a class="nav-link active" href="wiki.html">Wiki</a>
             </li>
           </ul>
         </div>
@@ -41,10 +41,17 @@
     </nav>
    </header>
    <body>
+     <main>
       <h2>How to install XLibre</h2>
         <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/xRzfHzZ6WDU?si=fWTrces_hvnUBvNH" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
       <div class="quicklink">
          <a href="#Arch">Arch Linux</a>
+         <br>
+         <a href="#Artix">Artix Linux</a>
+         <br>
+         <a href="#Gentoo">Gentoo Linux</a>
+         <br>
+         <a href="#Others">Others</a>
       </div>
       <div id="main-content">
          <div class="install">
@@ -52,24 +59,33 @@
             <ul>
                <li id="Arch">Arch Linux (AUR)
                   <a href="https://aur.archlinux.org/packages/xlibre-server-git#comment-1028466">Note: See this comment</a>
-<pre>
-<code>yay -S xlibre-server-bootstrap-git
-yay -S xlibre-input-libinput
-yay -S xlibre-server-git
-</code>
-</pre>
+                     <pre>
+                     <code>
+   yay -S xlibre-server-bootstrap-git
+   yay -S xlibre-input-libinput
+   yay -S xlibre-server-git
+                     </code>
+                     </pre>
                </li>
-               <li>Artix Linux</li>
-               <li>Gentoo Linux
+               <li id="Artix">Artix Linux
+                  <a href="https://wiki.artixlinux.org/Site/XlibreOnArtix">See this guide for XLibre on Artix</a>
+               </li>
+               <li id="Gentoo">Gentoo Linux
                   <a href="https://github.com/X11Libre/ports-gentoo">See Repo for packaging on Gentoo</a>
                </li>
+
+               <li id="others">
+                  <p>Others : Build it yourself. If not available in your packages manager.</p>
+               </li>
             </ul>
          </div>
       </div>
    </body>
+   </main>
    <footer>
         <div id="content-right">
          <div id="nav-sidebar" class="nav-border">
+           <div id="nav-content">
             <h3>Contact</h3>
             <ul>
                <li><a href="https://www.freelists.org/list/xlibre">Mailing list</a></li>
@@ -80,7 +96,8 @@ yay -S xlibre-server-git
                <ul>
                <li><a href="https://github.com/X11Libre/xserver">Github</a></li>
                </ul>
+           </div>
          </div>
       </div>
 </footer>
-</html>
\ No newline at end of file
+</html>