Merge pull request #12 from westonbelk/neo

Revamp website styles
westonbelk · Apr 3, 2024 · ec6fef9 · ec6fef9
2 parents d96326a + 1d36254
commit ec6fef9
Show file tree

Hide file tree

Showing 16 changed files with 209 additions and 122 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,10 @@ update: update-writeups
 
 
 update-writeups:
+ifeq ($(shell uname -s), Darwin)
+	# use a more recent version of sed from nix
+	alias sed=~/.local/bin/sed
+endif
 	find _writeups/* -maxdepth 0 -type d -exec rm -rf {} +
 	cp -r ../sec-writeups/CTFs/* _writeups/
 	find _writeups/ -type f -exec sed -i 's/\.md)/)/g' {} +

diff --git a/_includes/breadcrumb-ctf.html b/_includes/breadcrumb-ctf.html
@@ -0,0 +1,11 @@
+<nav aria-label="breadcrumb">
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item"><a href="/writeups/">CTFs</a></li>
+        {% if page.type == "problem" %}
+        <li class="breadcrumb-item"><a href="/writeups/{{page.ctf}}/">{{page.ctf}}</a></li>
+        <li class="breadcrumb-item active" aria-current="page">{{page.title}}</li>
+        {% else %}
+        <li class="breadcrumb-item active">{{page.ctf}}</li>
+        {% endif %}
+    </ol>
+</nav>
diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>{{ page.title }}</title>
+	<!-- Required meta tags -->
+	<meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+	<!-- Stylesheets -->
+        <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+	<link rel="stylesheet" type="text/css" href="/style.css">
+</head>
+
+
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -1,10 +1,11 @@
-<nav class="navbar navbar-expand-lg navbar-light mb-3 border-bottom beige">
+<nav class="navbar navbar-expand-md border-bottom ">
+    <div class="container-md" style="max-width:1024px">
+
 	<a class="navbar-brand" href="/">westonbelk.com</a>
-	<button type="button" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-links" aria-controls="navbar-links" aria-expanded="false" aria-label="Toggle navigation">
+	<button type="button" class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-links" aria-controls="navbar-links" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-
-	<div class="collapse navbar-collapse" id="navbar-links">
+	<div class="collapse navbar-collapse justify-content-end" id="navbar-links">
 		<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
 			{% for item in site.data.navigation %}
 			{% assign alt_link = item.link | append: "index.html" %}
@@ -16,4 +17,5 @@
 			{% endfor %}
 		</ul>
 	</div>
-</nav>
+    </div>
+</nav>
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -0,0 +1,6 @@
+
+<!-- Javascript -->
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
+
diff --git a/_layouts/ctf.html b/_layouts/ctf.html
@@ -1,48 +1,8 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{{ page.title }}</title>
-	<!-- Required meta tags -->
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+---
+layout: default
+---
 
-	<!-- Stylesheets -->
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.3.1/styles/default.min.css">
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
-	<link rel="stylesheet" type="text/css" href="/highlight.css">
-	<link rel="stylesheet" type="text/css" href="/style.css">
-</head>
-<body>
-{% include navigation.html %}
+<!-- Remove duplicate title for the problem -->
+{% assign h1_tag = page.title | prepend: "# " | markdownify %}
+{{ content | remove_first: h1_tag }}
 
-<main role="main" class="container">
-	<nav aria-label="breadcrumb">
-		<ol class="breadcrumb">
-			<li class="breadcrumb-item"><a href="/writeups/">CTFs</a></li>
-			<li class="breadcrumb-item"><a href="/writeups/{{page.ctf}}/">{{page.ctf}}</a></li>
-			<li class="breadcrumb-item active" aria-current="page">{{page.title}}</li>
-		</ol>
-	</nav>
-
-	<article class="body-article">
-		<header class="jumbotron">
-			<h1 id="hero-title">{{ page.title }}</h1>
-			<p id="hero-text">{{ page.points }} point(s)</p>
-		</header>
-
-		<section>
-			<!-- Remove duplicate title for the problem -->
-			{% assign h1_tag = page.title | prepend: "# " | markdownify %}
-			{{ content | remove_first: h1_tag }}
-		</section>
-	</article>
-</main>
-{% include footer.html %}
-
-	<!-- Javascript -->
-	<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
-</body>
-</html>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,45 +1,32 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{{ page.title }}</title>
-	<!-- Required meta tags -->
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-	<!-- Stylesheets -->
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
-	<link rel="stylesheet" type="text/css" href="/style.css">
-</head>
+{% include header.html %}
 <body>
 {% include navigation.html %}
 
-<main role="main" class="container">
+<main role="main" class="container-md" style="max-width:1024px">
 	{% if page.ctf %}
-	<nav aria-label="breadcrumb">
-		<ol class="breadcrumb">
-			<li class="breadcrumb-item"><a href="/writeups/">CTFs</a></li>
-			<li class="breadcrumb-item active">{{page.ctf}}</li>
-		</ol>
-	</nav>
+        {% include breadcrumb-ctf.html %}
 	{% endif %}
-	<article class="body-article">
-		<header class="jumbotron">
-			<h1 id="hero-title">{{ page.hero-title }}</h1>
-			<p id="hero-text">{{ page.hero-text }}</p>
-		</header>
 
-		<section>
-			{{ content }}
-		</section>
-	</article>
+        {% if page.homepage %}
+
+        {% elsif page.ctf != "" and page.type == "problem" %}
+        <h1>{{ page.title }}</h1>
+        <p>{{ page.points }}</p>
+
+        {% else %}
+        <h1>{{ page.hero-title }}</h1>
+        <p>{{ page.hero-text }}</p>
+
+        {% endif %}
+
+
+        <article>
+        {{ content }}
+        </article>
 </main>
-{% include footer.html %}
 
+{% include footer.html %}
+{% include scripts.html %}
 
-	<!-- Javascript -->
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
 </body>
-</html>
+</html>
diff --git a/_writeups/2021-damctf/Imp3rs0nAt0r-1.md b/_writeups/2021-damctf/Imp3rs0nAt0r-1.md
@@ -88,7 +88,3 @@ One of the attachments in the message history contains their master plan and the
 =========================================
 ```
 
-
-## Continued On
-
-
diff --git a/_writeups/2021-deadface/Scanners.md b/_writeups/2021-deadface/Scanners.md
@@ -204,6 +204,4 @@ func findReplies(pcapFile string, flow gopacket.Flow) {
 ```
 Discovered ports: 21,135,139,445,3389
 ```
-## Continued On
-
 
diff --git a/index.md b/index.md
@@ -1,9 +1,34 @@
 ---
 layout: default
 title: westonbelk.com
+homepage: True
 hero-title: Weston Belk
 ---
-* [LinkedIn](https://www.linkedin.com/in/weston-belk-68a868162)
-* [Github](https://github.com/westonbelk)
-* [Presentations](/presentations/)
-* [Writeups](/writeups/)
+
+<div class="d-flex flex-column align-items-center homepage-flex">
+    <div style="height:60px" class="homepage-flex-item"></div>
+    <div class="homepage-flex-item">
+        <h1>hi my name is weston.</h1>
+    </div>
+    <p class="homepage-flex-item"></p>
+    <p class="homepage-flex-item">
+    I'm a developer, security engineer, and competitive Pokémon tcg player. This site is where I post technical writeups from CTFs, share presentations I've given, and talk about some of my projects.
+    </p>
+    <p></p>
+    <p></p>
+</div>
+
+## Featured Writeups
+
+* UTCTF 2024 writeup for [Home on the Range](/writeups/2024-utctf/Home%20on%20the%20Range.html)
+* Sunshine CTF 2023 writeup for [Knowledge Repository](/writeups/2023-sunshine/Knowledge%20Repository.html)
+* Deadface 2021 writeup for [Scanners](/writeups/2021-deadface/Scanners.html)
+* DamCTF 2021 writeup for [Imp3rs0nAt0r-1](/writeups/2021-damctf/Imp3rs0nAt0r-1.html)
+
+## Socials
+
+* Connect with me on [LinkedIn](https://www.linkedin.com/in/weston-belk/)
+* Check out my projects on [Github](https://github.com/westonbelk)
+
+
+
diff --git a/presentations b/presentations
diff --git a/style.css b/style.css
@@ -1,3 +1,5 @@
+@import "syntax-highlighter.css";
+
 img {
 	max-width: 100%;
 }
@@ -15,11 +17,27 @@ pre {
     tab-size: 4;
 }
 
+/* Codeblock styles */
+pre.highlight {
+    border: 1px solid #e5e5e5;
+    border-radius: 8px;
+    padding: 5px 5px;
+}
+
+/* Homepage styles */
+.homepage-flex {
+    gap: 10px;
+}
+.homepage-flex-item {
+    max-width: 696px;
+}
+
 /* Nav bar styles */
 .border-top { border-top: 1px solid #e5e5e5; }
 .border-bottom { border-bottom: 1px solid #e5e5e5; }
 .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); }
-.beige { background-color: #f8f8f8;}
+.navbar { padding-top: 16px; padding-bottom: 16px; }
+a.nav-link { padding-left: 12px; padding-right: 12px; }
 
 /* Sticky footer styles
 -------------------------------------------------- */
@@ -33,6 +51,7 @@ body {
 }
 
 main {
+        padding-top: 20px;
 	padding-bottom: 46px;
 }
 

diff --git a/syntax-highlighter.css b/syntax-highlighter.css
@@ -0,0 +1,69 @@
+.highlight .hll { background-color: #ffffcc }
+.highlight .c { color: #8f5902; font-style: italic } /* Comment */
+.highlight .err { color: #a40000; border: 1px solid #ef2929 } /* Error */
+.highlight .g { color: #000000 } /* Generic */
+.highlight .k { color: #204a87; font-weight: bold } /* Keyword */
+.highlight .l { color: #000000 } /* Literal */
+.highlight .n { color: #000000 } /* Name */
+.highlight .o { color: #ce5c00; font-weight: bold } /* Operator */
+.highlight .x { color: #000000 } /* Other */
+.highlight .p { color: #000000; font-weight: bold } /* Punctuation */
+.highlight .cm { color: #8f5902; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #8f5902; font-style: italic } /* Comment.Preproc */
+.highlight .c1 { color: #8f5902; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #8f5902; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #a40000 } /* Generic.Deleted */
+.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #ef2929 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #000000; font-style: italic } /* Generic.Output */
+.highlight .gp { color: #8f5902 } /* Generic.Prompt */
+.highlight .gs { color: #000000; font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #a40000; font-weight: bold } /* Generic.Traceback */
+.highlight .kc { color: #204a87; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #204a87; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #204a87; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #204a87; font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { color: #204a87; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #204a87; font-weight: bold } /* Keyword.Type */
+.highlight .ld { color: #000000 } /* Literal.Date */
+.highlight .m { color: #0000cf; font-weight: bold } /* Literal.Number */
+.highlight .s { color: #4e9a06 } /* Literal.String */
+.highlight .na { color: #c4a000 } /* Name.Attribute */
+.highlight .nb { color: #204a87 } /* Name.Builtin */
+.highlight .nc { color: #000000 } /* Name.Class */
+.highlight .no { color: #000000 } /* Name.Constant */
+.highlight .nd { color: #5c35cc; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #ce5c00 } /* Name.Entity */
+.highlight .ne { color: #cc0000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #000000 } /* Name.Function */
+.highlight .nl { color: #f57900 } /* Name.Label */
+.highlight .nn { color: #000000 } /* Name.Namespace */
+.highlight .nx { color: #000000 } /* Name.Other */
+.highlight .py { color: #000000 } /* Name.Property */
+.highlight .nt { color: #204a87; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #000000 } /* Name.Variable */
+.highlight .ow { color: #204a87; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+.highlight .mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
+.highlight .mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */
+.highlight .mi { color: #0000cf; font-weight: bold } /* Literal.Number.Integer */
+.highlight .mo { color: #0000cf; font-weight: bold } /* Literal.Number.Oct */
+.highlight .sb { color: #4e9a06 } /* Literal.String.Backtick */
+.highlight .sc { color: #4e9a06 } /* Literal.String.Char */
+.highlight .sd { color: #8f5902; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #4e9a06 } /* Literal.String.Double */
+.highlight .se { color: #4e9a06 } /* Literal.String.Escape */
+.highlight .sh { color: #4e9a06 } /* Literal.String.Heredoc */
+.highlight .si { color: #4e9a06 } /* Literal.String.Interpol */
+.highlight .sx { color: #4e9a06 } /* Literal.String.Other */
+.highlight .sr { color: #4e9a06 } /* Literal.String.Regex */
+.highlight .s1 { color: #4e9a06 } /* Literal.String.Single */
+.highlight .ss { color: #4e9a06 } /* Literal.String.Symbol */
+.highlight .bp { color: #3465a4 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #000000 } /* Name.Variable.Class */
+.highlight .vg { color: #000000 } /* Name.Variable.Global */
+.highlight .vi { color: #000000 } /* Name.Variable.Instance */
+.highlight .il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */
diff --git a/vendor/reveal.js b/vendor/reveal.js
diff --git a/web-projects/index.html b/web-projects/index.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,7 +88,3 @@ One of the attachments in the message history contains their master plan and the
		=========================================
		```


		## Continued On
-Original file line number
+Diff line change
@@ Expand Up / @@ -204,6 +204,4 @@ func findReplies(pcapFile string, flow gopacket.Flow) { @@
     ```
     Discovered ports: 21,135,139,445,3389
     ```
-    ## Continued On