Revert "Merge changes."

This reverts commit 8cf217ca9f.
This commit is contained in:
Kaj Forney 2023-02-14 19:19:13 -07:00
parent 8cf217ca9f
commit 048a29870b
Signed by: kforney
GPG key ID: 3AB4E2E04CEF656F
2 changed files with 499 additions and 638 deletions

View file

@ -101,13 +101,12 @@ textarea {
#B17300 RGBA(177, 115, 0, 1) HSL(39, 100%, 35%)
*/
body,
html {
body, html {
margin: 0;
}
body {
background-color: #161a25;
background-color: #161A25;
background-image: url("/img/branding/backgroundSmall.png");
}
@ -118,7 +117,7 @@ a {
h1 {
font-family: VT323;
font-size: 64px;
color: #ffbc42;
color: #FFBC42;
text-align: center;
}
@ -130,14 +129,14 @@ h2 {
}
h5 {
font-family: "IBM Plex Mono", monospace;
font-family: 'IBM Plex Mono', monospace;
font-size: 28px;
color: #78a1bb;
text-align: center;
}
p {
font-family: "IBM Plex Sans", sans-serif;
font-family: 'IBM Plex Sans', sans-serif;
font-size: 20px;
color: #78a1bb;
text-align: center;
@ -150,7 +149,8 @@ hr {
margin-right: auto;
}
iframe[src*="youtube"] {
iframe[src*=youtube]
{
text-align: center;
display: block;
margin-right: auto;
@ -158,7 +158,8 @@ iframe[src*="youtube"] {
max-width:80%;
}
iframe[src*="itch"] {
iframe[src*=itch]
{
text-align: center;
display: block;
margin-right: auto;
@ -183,7 +184,7 @@ iframe[src*="itch"] {
.navbar-brand {
font-family: VT323;
font-size: 36px;
color: #ffbc42;
color: #FFBC42;
}
.navbar-text {
@ -205,11 +206,11 @@ iframe[src*="itch"] {
.navbar-brand:hover {
color: #78a1bb;
text-shadow: #b17300 2px 2px 3px;
text-shadow: #B17300 2px 2px 3px;
}
.navbar-link {
color: #ffbc42;
color: #FFBC42;
font-family: VT323, monospace;
font-size: 36px;
padding-left: 50px;
@ -219,13 +220,13 @@ iframe[src*="itch"] {
.navbar-link:hover {
color: #78a1bb;
text-shadow: #b17300 2px 2px 3px;
text-shadow: #B17300 2px 2px 3px;
}
.card {
background-color: RGBA(22, 26, 37, 70%);
border-radius: 30px;
box-shadow: #b17300 0px 0px 20px;
box-shadow: #B17300 0px 0px 20px;
}
.text-shadow {
@ -235,7 +236,7 @@ iframe[src*="itch"] {
.section-title{
padding-top: 5px;
padding-bottom: 10px;
text-shadow: #b17300 3px 3px 3px;
text-shadow: #B17300 3px 3px 3px;
}
.youtube-container {
@ -262,14 +263,13 @@ iframe[src*="itch"] {
.fa-brands:hover {
color: #78a1bb;
text-shadow: #b17300 2px 2px 3px;
text-shadow: #B17300 2px 2px 3px;
}
.footer {
width: 100%;
height: 60px;
line-height: 60px;
text-align: center;
}
#footerText {
@ -299,12 +299,12 @@ iframe[src*="itch"] {
}
@font-face {
font-family: "IBM Plex Mono", monospace;
font-family: 'IBM Plex Mono', monospace;
src: url("https://kforney.github.io/fonts/IBMPlexMono-Regular.ttf");
}
@font-face {
font-family: "IBM Plex Sans", sans-serif;
font-family: 'IBM Plex Sans', sans-serif;
src: url("https://kforney.github.io/fonts/IBMPlexSans-Regular.ttf");
}
@ -481,3 +481,4 @@ iframe[src*="itch"] {
page-break-after: avoid;
}
}

View file

@ -1,47 +1,33 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en-us">
<head>
<meta charset="utf-8" />
<meta charset="utf-8">
<title></title>
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="manifest" href="site.webmanifest" />
<link rel="apple-touch-icon" href="icon.png" />
<link rel="manifest" href="site.webmanifest">
<link rel="apple-touch-icon" href="icon.png">
<link rel="stylesheet" href="css/bootstrap.min.css" />
<link rel="stylesheet" href="css/normalize.css" />
<link rel="stylesheet" href="css/main.css" />
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
<meta name="theme-color" content="#fafafa" />
<meta name="theme-color" content="#fafafa">
<script src="https://kit.fontawesome.com/55072ce5fd.js" crossorigin="anonymous"></script>
<script
src="https://kit.fontawesome.com/55072ce5fd.js"
crossorigin="anonymous"
></script>
</head>
<body class="parallax">
<nav
class="navbar navbar-expand-lg navbar-dark sticky-top bg-dark shadow-lg"
>
<nav class="navbar navbar-expand-lg navbar-dark sticky-top bg-dark shadow-lg">
<a class="navbar-brand" href="#">
<img
src="img/branding/LunarPenguin_newPalette_transparency_brightDiamond.png"
alt="Logo"
class="navbar-logo"
/>
<img src="img/branding/LunarPenguin_newPalette_transparency_brightDiamond.png" alt="Logo" class="navbar-logo">
Kaj Forney
</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"
>
<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>
</button>
@ -60,9 +46,7 @@
</li>
<span class="navbar-text d-none d-sm-block">|</span>
<li class="nav-item">
<a class="navbar-link" href="files/resume.pdf" target="_blank"
>RESUME</a
>
<a class="navbar-link" href="files/resume.pdf">RESUME</a>
</li>
</ul>
</div>
@ -79,15 +63,9 @@
</div>
<div class="row">
<div class="col">
<p>
Greetings! I am a human who enjoys pixel art, programming, and
penguins.
</p>
<p>Greetings! I am a human who enjoys pixel art, programming, and penguins.</p>
<p>Sometimes, I also make games.</p>
<p>
This site displays a few of the things I've made or helped to
make.
</p>
<p>This site displays a few of the things I've made or helped to make.</p>
</div>
</div>
</div>
@ -108,6 +86,7 @@
<div class="container-md card">
<div class="card-body">
<div class="row">
<div class="col-sm-4">
<h2>The Climb</h2>
@ -115,17 +94,8 @@
<p>[2021]</p>
</div>
<div class="col-sm-8">
<p>
The Climb is a small game I created in Unity, originally as part
of my work in my GIMM 100 course. In the game, you control a
robot who must escape by climbing on tetrominoes as they fall
from above.
</p>
<p>
Later, I updated the game to add additional levels, as well as
improved lighting using Unity's 2D Lighting system and the
Universal Render Pipeline.
</p>
<p>The Climb is a small game I created in Unity, originally as part of my work in my GIMM 100 course. In the game, you control a robot who must escape by climbing on tetrominoes as they fall from above.</p>
<p>Later, I updated the game to add additional levels, as well as improved lighting using Unity's 2D Lighting system and the Universal Render Pipeline.</p>
</div>
</div>
@ -133,24 +103,14 @@
<div class="row">
<div class="youtube-container">
<iframe
class="youtube-iframe"
src="https://www.youtube.com/embed/N5unzGlC9ME"
title="YouTube video player"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen
></iframe>
<iframe class="youtube-iframe" src="https://www.youtube.com/embed/N5unzGlC9ME" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
</div>
<div class="row mt-3">
<iframe
src="https://itch.io/embed/1308115?border_width=0&amp;bg_color=12161f&amp;fg_color=78a1bb&amp;link_color=ffbc42&amp;border_color=283044"
><a href="https://lunarpenguin.itch.io/the-climb"
>The Climb by Lunar_Penguin</a
></iframe
>
<iframe src="https://itch.io/embed/1308115?border_width=0&amp;bg_color=12161f&amp;fg_color=78a1bb&amp;link_color=ffbc42&amp;border_color=283044"><a href="https://lunarpenguin.itch.io/the-climb">The Climb by Lunar_Penguin</a></iframe>
</div>
</div>
</div>
@ -163,25 +123,14 @@
<p>[2020]</p>
</div>
<div class="col-sm-8">
<p>
Megashigi is a game that I helped create using the Godot Engine,
along with several friends, as a birthday gift. My portion of
the project included the implementation of the game's playable,
interactive credits sequence, as well as general level design,
and subtitles for the game's boss rap sequence.
</p>
<p>Megashigi is a game that I helped create using the Godot Engine, along with several friends, as a birthday gift. My portion of the project included the implementation of the game's playable, interactive credits sequence, as well as general level design, and subtitles for the game's boss rap sequence.</p>
</div>
</div>
<div class="mt-4"></div>
<div class="row mt-3">
<iframe
src="https://itch.io/embed/630032?border_width=0&amp;bg_color=12161f&amp;fg_color=78a1bb&amp;link_color=ffbc42&amp;border_color=283044"
><a href="https://lopar.itch.io/megashigi"
>The Climb by Lunar_Penguin</a
></iframe
>
<iframe src="https://itch.io/embed/630032?border_width=0&amp;bg_color=12161f&amp;fg_color=78a1bb&amp;link_color=ffbc42&amp;border_color=283044"><a href="https://lopar.itch.io/megashigi">The Climb by Lunar_Penguin</a></iframe>
</div>
</div>
</div>
@ -194,6 +143,7 @@
<hr/>
<div class="container-lg">
<div class="row">
<div class="col">
<h1 class="section-title">ART</h1>
@ -204,145 +154,68 @@
<div class="col">
<div id="art-carousel" class="carousel slide" data-bs-ride="false">
<div class="carousel-indicators">
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="0"
class="active"
aria-current="true"
aria-label="Slide 1"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="1"
aria-label="Slide 2"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="2"
aria-label="Slide 3"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="3"
aria-label="Slide 4"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="4"
aria-label="Slide 5"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="5"
aria-label="Slide 6"
></button>
<button
type="button"
data-bs-target="#carouselExampleCaptions"
data-bs-slide-to="6"
aria-label="Slide 7"
></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="1" aria-label="Slide 2"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="2" aria-label="Slide 3"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="3" aria-label="Slide 4"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="4" aria-label="Slide 5"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="5" aria-label="Slide 6"></button>
<button type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide-to="6" aria-label="Slide 7"></button>
</div>
<div class="carousel-inner">
<div class="carousel-item active">
<img
src="img/art/rakuenDoor.png"
class="d-block w-100"
alt="..."
/>
<img src="img/art/rakuenDoor.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow">RAKUEN ART [2022]</h5>
<p class="text-shadow">
A scene from the game <i>Rakuen</i>, recreated in Blender.
</p>
<p class="text-shadow">A scene from the game <i>Rakuen</i>, recreated in Blender.</p>
</div>
</div>
<div class="carousel-item">
<img
src="img/art/airship1.png"
class="d-block w-100"
alt="..."
/>
<img src="img/art/airship1.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow">AIRSHIP MODEL [2022]</h5>
<p class="text-shadow">Created in Blender</p>
</div>
</div>
<div class="carousel-item">
<img
src="img/art/airship2.png"
class="d-block w-100"
alt="..."
/>
<img src="img/art/airship2.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow">AIRSHIP MODEL [2022]</h5>
<p class="text-shadow">Created in Blender.</p>
</div>
</div>
<div class="carousel-item">
<img src="img/art/cat.png" class="d-block w-100" alt="..." />
<img src="img/art/cat.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow">DIGITAL PORTRAIT [2021]</h5>
<p class="text-shadow">
A digital painting of my cat, Okapi.
</p>
<p class="text-shadow">A digital painting of my cat, Okapi.</p>
</div>
</div>
<div class="carousel-item">
<img
src="img/art/portrait_dad.png"
class="d-block w-100"
alt="..."
/>
<img src="img/art/portrait_dad.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow"></h5>
<p class="text-shadow"></p>
</div>
</div>
<div class="carousel-item">
<img src="img/art/dadKaj.png" class="d-block w-100" alt="..." />
<img src="img/art/dadKaj.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block"></div>
</div>
<div class="carousel-item">
<img
src="img/art/symbolSet_fullSet.png"
class="d-block w-100"
alt="..."
/>
<img src="img/art/symbolSet_fullSet.png" class="d-block w-100" alt="...">
<div class="carousel-caption d-none d-md-block">
<h5 class="text-shadow"></h5>
<p class="text-shadow"></p>
</div>
</div>
</div>
<button
class="carousel-control-prev"
type="button"
data-bs-target="#art-carousel"
data-bs-slide="prev"
>
<span
class="carousel-control-prev-icon"
aria-hidden="true"
></span>
<button class="carousel-control-prev" type="button" data-bs-target="#art-carousel" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden">Previous</span>
</button>
<button
class="carousel-control-next"
type="button"
data-bs-target="#art-carousel"
data-bs-slide="next"
>
<span
class="carousel-control-next-icon"
aria-hidden="true"
></span>
<button class="carousel-control-next" type="button" data-bs-target="#art-carousel" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden">Next</span>
</button>
</div>
@ -352,24 +225,12 @@
<div class="row mt-5">
<div class="col-sm">
<div class="youtube-container">
<iframe
class="youtube-iframe"
src="https://www.youtube.com/embed/LaloFVeUvOk"
title="YouTube video player"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen
></iframe>
<iframe class="youtube-iframe" src="https://www.youtube.com/embed/LaloFVeUvOk" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
</div>
<div class="col-sm">
<div class="youtube-container">
<iframe
class="youtube-iframe"
src="https://www.youtube.com/embed/ahQPl9FOX7A"
title="YouTube video player"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen
></iframe>
<iframe class="youtube-iframe" src="https://www.youtube.com/embed/ahQPl9FOX7A" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
</div>
</div>
@ -377,7 +238,7 @@
<div id="social"></div>
<hr class="mt-5" />
<hr class="mt-5">
<div class="container-lg mw-25 w-50">
<div class="row">
@ -399,11 +260,7 @@
</a>
</div>
<div class="col">
<a
rel="me"
href="https://mastodon.gamedev.place/@lunar_penguin"
target="_blank"
>
<a rel="me" href="https://mastodon.gamedev.place/@lunar_penguin" target="_blank">
<h2 title="Mastodon">
<i class="fa-brands fa-mastodon"></i>
</h2>
@ -447,7 +304,9 @@
</a>
</div>
</div>
<div class="row"></div>
<div class="row">
</div>
</div>
<div class="mt-5"></div>
@ -463,8 +322,9 @@
<script src="js/bootstrap.min.js"></script>
<script>
document.getElementById("footerText").innerHTML =
"Copyright © Kaj Forney 2018-" + new Date(Date.now()).getFullYear();
document.getElementById("footerText").innerHTML = "Copyright © Kaj Forney 2018-" + new Date(Date.now()).getFullYear();
</script>
</body>
</html>