aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlee <alee14498@gmail.com>2018-03-07 16:47:39 -0500
committerAlee <alee14498@gmail.com>2018-03-07 16:47:39 -0500
commit80216b81654926fdd000126e29a8d7026ff498cc (patch)
tree3cfbb0cb353527f8160fd3fee6ea34d60d946d74
parenta633735329c301ec7a02d564297e14500f66184d (diff)
parentd308d9cd1a5f8ac1906ea0e5beda44f75c9137e1 (diff)
downloadpokeworld-website-80216b81654926fdd000126e29a8d7026ff498cc.tar.gz
pokeworld-website-80216b81654926fdd000126e29a8d7026ff498cc.tar.bz2
pokeworld-website-80216b81654926fdd000126e29a8d7026ff498cc.zip
Merge branch 'master' of https://github.com/PokeWorld/pokeworld.github.io
-rw-r--r--README.md4
-rwxr-xr-xindex.html2
-rw-r--r--pokebot.html35
3 files changed, 39 insertions, 2 deletions
diff --git a/README.md b/README.md
index dc5026a..973c080 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
-# pokeworld.github.io
+# PokeWorld Website
+
+A website for PokeWorld, and related projects. \ No newline at end of file
diff --git a/index.html b/index.html
index f4c6130..7d64ed9 100755
--- a/index.html
+++ b/index.html
@@ -16,7 +16,7 @@
<nav>
<ul>
<li class="current"><a href="#">Home</a></li>
- <li><a href="#">Pokebot</a></li>
+ <li><a href="pokebot.html">Pokebot</a></li>
<li><a href="#">Typer</a></li>
<li><a href="#">About</a></li>
</ul>
diff --git a/pokebot.html b/pokebot.html
new file mode 100644
index 0000000..eea0c37
--- /dev/null
+++ b/pokebot.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<!-- The style is based from the ACN website !-->
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width">
+ <title>PokeWorld | Home</title>
+ <link rel="stylesheet" href="./css/style.css">
+ </head>
+ <body>
+ <header>
+ <div class="container">
+ <div id="branding">
+ <h1>PokeWorld</h1>
+ </div>
+ <nav>
+ <ul>
+ <li><a href="index.html">Home</a></li>
+ <li class="current"><a href="#">Pokebot</a></li>
+ <li><a href="#">Typer</a></li>
+ <li><a href="#">About</a></li>
+ </ul>
+ </nav>
+ </div>
+ </header>
+ <div class="container">
+ <h1>PokeBot</h1>
+ <h2>The bot that powers our entire server.</h2>
+ <p>Hi, I am dummy developer text.</p>
+ </div>
+ <footer>
+ <p>PokeWorld by: Alee, TheEdgeNK and jtshieh, Copyright &copy; 2018</p>
+ </footer>
+ </body>
+</html>