aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--404.html6
-rw-r--r--_includes/heading.html1
-rw-r--r--_includes/navigator.html2
-rw-r--r--_layouts/default.html4
-rwxr-xr-xassets/AleeBot.pngbin0 -> 243570 bytes
-rwxr-xr-xassets/silicon-linux.pngbin0 -> 19494 bytes
-rw-r--r--blog.html4
-rw-r--r--contact.md2
-rw-r--r--favicon.icobin0 -> 2829 bytes
-rw-r--r--index.html8
-rw-r--r--project.md10
-rw-r--r--projects.md37
-rw-r--r--style.css42
13 files changed, 93 insertions, 23 deletions
diff --git a/404.html b/404.html
index 4ec9ea8..810c51f 100644
--- a/404.html
+++ b/404.html
@@ -10,9 +10,9 @@
<div class="container">
<h1 class ="title">404</h1>
- <p class="center"><strong>Page not found :(</strong></p>
- <p class="center"><b>Uh Oh!</b> The requested page could not be found.</p>
- <p class="center">You may need to go back to the <a href ="/">homepage</a>.</p>
+ <p><center><strong>Page not found :(</strong></center></p>
+ <p><center><b>Uh Oh!</b> The requested page could not be found.</center></p>
+ <p><center>You may need to go back to the <a href ="/">homepage</a>.</center></p>
</div>
{% include footer.html %}
</BODY>
diff --git a/_includes/heading.html b/_includes/heading.html
index 08ac248..d7f51d3 100644
--- a/_includes/heading.html
+++ b/_includes/heading.html
@@ -1,4 +1,5 @@
<link href="/style.css" type="text/css" rel="stylesheet">
+<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
<script src="/jquery-3.3.1.min.js"></script>
<script src="/scripts.js"></script>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
diff --git a/_includes/navigator.html b/_includes/navigator.html
index 89e617e..9fe852a 100644
--- a/_includes/navigator.html
+++ b/_includes/navigator.html
@@ -2,7 +2,7 @@
<ul class="navbar">
<li class="nav logo">Andrew Lee</li>
<li class="nav" {% if page.url == "/" %}style="background-color: #1f8e42;"{% endif %}><a class="nav" href="/">HOME</a></li>
- <li class="nav" {% if page.url == "/project.html" %}style="background-color: #1f8e42;"{% endif %}><a class="nav" href="/project.html">PROJECTS</a></li>
+ <li class="nav" {% if page.url == "/projects.html" %}style="background-color: #1f8e42;"{% endif %}><a class="nav" href="/projects.html">PROJECTS</a></li>
<li class="nav" {% if page.url == "/blog.html" %}style="background-color: #1f8e42;"{% endif %}><a class="nav" href="/blog.html">BLOG</a></li>
<li class="nav" {% if page.url == "/contact.html" %}style="background-color: #1f8e42;"{% endif %}><a class="nav" href="/contact.html">CONTACT</a></li>
</ul>
diff --git a/_layouts/default.html b/_layouts/default.html
index fe6477c..6c41632 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,6 +8,10 @@
</HEAD>
<BODY>
{% include navigator.html %}
+ <div class="jumbotron">
+ <h1 class ="title">{{ page.title }}</h1>
+ <h2><center>{{ page.description }}</center></h2>
+ </div>
<div class="container">
{{ content }}
</div>
diff --git a/assets/AleeBot.png b/assets/AleeBot.png
new file mode 100755
index 0000000..ef4215c
--- /dev/null
+++ b/assets/AleeBot.png
Binary files differ
diff --git a/assets/silicon-linux.png b/assets/silicon-linux.png
new file mode 100755
index 0000000..82a55b6
--- /dev/null
+++ b/assets/silicon-linux.png
Binary files differ
diff --git a/blog.html b/blog.html
index bc78db5..6529c45 100644
--- a/blog.html
+++ b/blog.html
@@ -8,8 +8,10 @@
</HEAD>
<BODY>
{% include navigator.html %}
+ <div class="jumbotron">
+ <h1 class ="title">Blog</h1>
+ </div>
<div class="container">
- <h1>Latest Posts</h1>
<ul>
{% for post in site.posts %}
diff --git a/contact.md b/contact.md
index 5265b25..877ada0 100644
--- a/contact.md
+++ b/contact.md
@@ -1,8 +1,8 @@
---
layout: default
title: Contact
+description: You can contact me thru these links.
---
-<h1 class ="title">Contact Me</h1>
<p><b>Email Address: {{ site.email }}</b></p>
<p><b>GitHub: <a href="https://github.com/Alee14">Alee14</a></b></p>
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..573995b
--- /dev/null
+++ b/favicon.ico
Binary files differ
diff --git a/index.html b/index.html
index 41f92ba..bc362ae 100644
--- a/index.html
+++ b/index.html
@@ -9,9 +9,11 @@ project: Andrew Lee
</HEAD>
<BODY>
{% include navigator.html %}
- <div class="container">
-<h1 class ="title">{{ site.title }} Homepage</h1>
-<h2><center><b>{{ site.description }}</b></center></h2>
+<div class="jumbotron">
+ <h1 class ="title">{{ site.title }} Homepage</h1>
+ <h2><center><b>{{ site.description }}</b></center></h2>
+</div>
+<div class="container">
<h3>What is this website?</h3>
<p>This is website my own personal website.</p>
<h3>Who am I?</h3>
diff --git a/project.md b/project.md
deleted file mode 100644
index a4ea4a7..0000000
--- a/project.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default
-title: Projects
----
-
-<h1 class ="title">Andrew's Projects</h1>
-<h2>These are the projects i'm currently working on:</h2>
-<p><a href="https://silicon-linux.net">Silicon Linux</a></p>
-<p><a href="https://github.com/AleeCorp/AleeBot">AleeBot</a></p>
-<p><a href="https://github.com/UniverseDevGroup/Project-Silicon">Project: Silicon</a></p>
diff --git a/projects.md b/projects.md
new file mode 100644
index 0000000..5f4b595
--- /dev/null
+++ b/projects.md
@@ -0,0 +1,37 @@
+---
+layout: default
+title: Projects
+description: These are the projects i'm currently working on
+---
+
+ <div class="row">
+ <div class="card">
+ <img src="./assets/AleeBot.png" alt="Logo" style="width:100%">
+ <div class="container-card">
+ <h4><b>AleeBot</b></h4>
+ <p>A Discord bot made in JavaScript</p>
+ <br>
+ <a href="https://github.com/AleeCorp/AleeBot" class="btn default"><i class="fa fa-github"></i> GitHub</a>
+ </div>
+</div>
+
+<div class="card">
+ <img src="./assets/silicon-linux.png" alt="Logo" style="width:100%">
+ <div class="container-card">
+ <h4><b>Silicon Linux</b></h4>
+ <p>An Arch based distribution</p>
+ <br>
+ <a href="https://silicon-linux.net" class="btn default">Website</a> <a href="https://github.com/silicon-linux" class="btn default"><i class="fa fa-github"></i> GitHub</a>
+
+ </div>
+</div>
+<div class="card">
+ <img src="./assets/silicon-linux.png" alt="Logo" style="width:100%">
+ <div class="container-card">
+ <h4><b>Project: Silicon</b></h4>
+ <p>A hacking game by Alee and Trey</p>
+ <br>
+ <a href="https://github.com/UniverseDevGroup/Project-Silicon" class="btn default"><i class="fa fa-github"></i> GitHub</a>
+ </div>
+</div>
+</div>
diff --git a/style.css b/style.css
index 30aa3e0..cfd8528 100644
--- a/style.css
+++ b/style.css
@@ -110,10 +110,6 @@ li a:hover {
color: white;
}
-.center {
- text-align: center;
-}
-
.nav .icon {
display: none;
}
@@ -124,7 +120,45 @@ li a:hover {
font-size: 14px;
color: white;
padding: 14px 30px;
+ text-decoration: none;
}
.default {background-color: #348d43; color: white;}
.default:hover {background: #ddd;}
+
+
+.jumbotron {
+ padding: 2rem 1rem;
+ margin-bottom: 2rem;
+ background-color: #1f8e42;
+ }
+
+ @media (min-width: 576px) {
+ .jumbotron {
+ padding: 4rem 2rem;
+ }
+ }
+
+ .jumbotron-fluid {
+ padding-right: 0;
+ padding-left: 0;
+ border-radius: 0;
+ }
+
+ .card {
+ background: white;
+ color: black;
+ padding: 20px;
+ width: 300px;
+ margin: 10px;
+}
+
+
+.row {
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap;
+ margin-right: -15px;
+ margin-left: -15px;
+} \ No newline at end of file