Fix head

RiiConnect24 · Oct 22, 2023 · fc3a169 · fc3a169
1 parent a74b05f
commit fc3a169
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 36 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -17,38 +17,38 @@ <h5><i class="fas fa-info-circle" aria-hidden"true"></i> About RiiConnect24</h5>
 				<h5><i class="fas fa-share-square" aria-hidden="true"></i> Connect with Us</h5>
 				<ul>
 					<li><i class="fas fa-cloud" aria-hidden="true"></i>
-						<a href="https://bsky.app/profile/riiconnect24.bsky.social">Bluesky</a></li>
+						<a href="https://bsky.app/profile/riiconnect24.bsky.social">Bluesky</a>
+					</li>
 					<li><i class="fab fa-discord" aria-hidden="true"></i>
-						<a href="https://discord.gg/rc24">Discord</a></li>
+						<a href="https://discord.gg/rc24">Discord</a>
+					</li>
 					<li><i class="fab fa-instagram" aria-hidden="true"></i>
-						<a href="https://www.instagram.com/RiiConnect24">Instagram</a></li>
+						<a href="https://www.instagram.com/RiiConnect24">Instagram</a>
+					</li>
 					<li><i class="fab fa-mastodon" aria-hidden="true"></i>
-						<a href="https://mastodon.social/@RiiConnect24">Mastodon</a></li>
+						<a href="https://mastodon.social/@RiiConnect24">Mastodon</a>
+					</li>
 					<li><i class="fab fa-github" aria-hidden="true"></i>
-						<a href="https://github.com/RiiConnect24">GitHub</a></li>
+						<a href="https://github.com/RiiConnect24">GitHub</a>
+					</li>
 					<li><i class="fab fa-reddit" aria-hidden="true"></i>
-						<a href="https://reddit.com/r/RiiConnect24">Reddit</a></li>
+						<a href="https://reddit.com/r/RiiConnect24">Reddit</a>
+					</li>
 					<li><i class="fab fa-threads" aria-hidden="true"></i>
-						<a href="https://threads.net/@riiconnect24">Threads</a></li>
+						<a href="https://threads.net/@riiconnect24">Threads</a>
+					</li>
 					<li><i class="fab fa-youtube" aria-hidden="true"></i>
-						<a href="https://www.youtube.com/RiiConnect24">YouTube</a></li>
+						<a href="https://www.youtube.com/RiiConnect24">YouTube</a>
+					</li>
 				</ul>
 			</div>
 			<div class="col l3 s12">
 				<h5><i class="fas fa-puzzle-piece" aria-hidden="true"></i> Affiliate Projects</h5>
 				<ul>
-<<<<<<< HEAD
-					<li><a class="white-text" href="https://gametdb.com/">GameTDB</a></li>
-					<li><a class="white-text" href="https://oscwii.org/">Open Shop Channel</a></li>
-					<li><a class="white-text" href="https://wiidatabase.de/">WiiDatabase</a></li>
-					<li><a class="white-text" href="https://wiimmfi.de/">Wiimmfi</a></li>
-=======
 					<li><a href="https://gametdb.com/">GameTDB</a></li>
 					<li><a href="https://oscwii.org/">Open Shop Channel</a></li>
 					<li><a href="https://wiidatabase.de/">WiiDatabase</a></li>
-					<li><a href="https://wiilink24.com/">WiiLink</a></li>
 					<li><a href="https://wiimmfi.de/">Wiimmfi</a></li>
->>>>>>> B
 				</ul>
 			</div>
 		</div>

diff --git a/services/speak.html b/services/speak.html
@@ -2,36 +2,24 @@
 layout: default
 title: Wii Speak Channel
 ---
-<<<<<<< HEAD
 <div class="section no-pad-bot">
   <div class="container">
     <br><br>
-    <h1 class="header center white-text"><i class="fas fa-microphone" aria-hidden="true"></i> Wii Speak Channel</h1>
+    <h1 class="header center"><i class="fas fa-microphone" aria-hidden="true"></i> Wii Speak Channel</h1>
     <div class="row center">
-      <h5 class="header col s12 light">Voice chat with people on your Wii.</h5>
+      <h5 class="header col s12">Voice chat with people on your Wii.</h5>
       <br>
       <img src="/images/wiimenu/speak.png" alt="Speak" />
       <br>
       <a href="https://github.com/RiiConnect24/RiiConnect24-Patcher/releases/latest" id="download-button"
-        class="btn-large waves-effect waves-light blue lighten-1">Obtain using Auto-WiiWare-Patcher</a>
-=======
-  <div class="section no-pad-bot">
-    <div class="container">
-      <br><br>
-      <h1 class="header center"><i class="fas fa-microphone" aria-hidden="true"></i> Wii Speak Channel</h1>
-      <div class="row center">
-        <h5 class="header col s12">Voice chat with people on your Wii.</h5>
-        <br>
-        <img src="/images/wiimenu/speak.png" alt="Speak" />
-        <br>
-				<a href="https://github.com/RiiConnect24/auto-wiiware-patcher/releases" id="download-button" class="btn-large waves-effect waves-light blue lighten-1">Obtain using Auto-WiiWare-Patcher</a>
-			</div>
+        class="btn-large waves-effect waves-light blue lighten-1">Obtain using RiiConnect24-Patcher</a>
+      <div class="section no-pad-bot">
+      </div>
       <audio autoplay>
-				<source src="/sounds/wiimenu/speak.wav" type="audio/wav">
-				Your browser does not support the audio element.
-			</audio>
+        <source src="/sounds/wiimenu/speak.wav" type="audio/wav">
+        Your browser does not support the audio element.
+      </audio>
       <br><br>
->>>>>>> B
     </div>
     <audio autoplay>
       <source src="/sounds/wiimenu/speak.wav" type="audio/wav">