Skip to content

Commit

Permalink
Restarting. Did side bit thing idk
Browse files Browse the repository at this point in the history
  • Loading branch information
MaximilianMcC committed Nov 12, 2024
1 parent 6b94678 commit e9c930a
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 355 deletions.
85 changes: 0 additions & 85 deletions public/contact.html

This file was deleted.

54 changes: 13 additions & 41 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,28 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Maximilian - Home</title>

<!-- Tab thing -->
<title>Maximilian</title>
<link rel="shortcut icon" href="./assets/image/icon.png" type="image/x-icon">
<meta name="description" content="My name is Max and I like to code and play games.">

<!-- Stylesheets -->
<link rel="stylesheet" href="./style/general.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter+Tight:ital,wght@0,400;1,900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Inter&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Lobster&display=swap" rel="stylesheet">

<!-- Scripts -->
<script src="./script/script.js" defer></script>
<link rel="stylesheet" href="./style/home.css">

<script src="./script/script.js"></script>
</head>
<body>

<!-- Header with my name -->
<header>
<h1>Maximilian</h1>
</header>

<!-- nav bar thing -->
<nav>
<ul>
<<<<<<< HEAD:index.html
<li><a href="index.html">Home</a></li>
<li><a href="contact.html">Contact</a></li>
=======
<li><a href="/">Home</a></li>
<li><a href="/lore">Lore</a></li>
<li><a href="/stats">Stats</a></li>
<li><a href="/contact">Contact</a></li>
>>>>>>> 6e976fb33058b04509ed22c72b665a757f17cad5:public/index.html
</ul>
</nav>
<div class="layout">

<!-- Actual website content -->
<main>
<div class="half left">
<h1>Maximilian</h1>
<p>I'm <span id="age">erhm</span> and like ferroequinology</p>
<p>and programming.</p></p>
</div>

<!-- Quick little thingy yapping about me -->
<section>
<h2>About me</h2>
<p>My name is Max. I'm <span id="age">a teenager</span> and live in New Zealand. I mostly spend my time coding, watching YouTube, and occasionally playing games. I also know heaps of Star Wars lore and have a strong interest in British steam trains. I'm a self-taught programmer, and my favorite language is C#. Some of my favorite games are Minecraft, Half-Life: Alyx, and Portal.</p>
</section>
<div class="half right">
<p>erhm</p>
</div>

</main>
</div>

</body>
</html>
87 changes: 1 addition & 86 deletions public/style/general.css
Original file line number Diff line number Diff line change
@@ -1,90 +1,5 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
box-sizing: border-box;
}

html {
height: 100dvh;
font-size: 1.8rem;
}

body {
height: 100%;
font-family: "Inter", sans-serif;
background-color: #191919;
color: white;
}

header {
height: 35%;
display: grid;
place-content: center;
font-size: 2.5rem;
font-family: "Inter Tight", sans-serif;
font-style: italic;
font-weight: bold;
background-color: #e89500;
}
header h1::first-letter {
font-family: "lobster", cursive;
font-style: normal;
}

nav {
background-color: #212121;
height: 5%;
}
nav ul {
height: 100%;
display: flex;
justify-content: space-around;
align-items: center;
list-style-type: none;
}
nav ul li a {
color: #cceeff;
text-decoration: none;
font-size: 0.9rem;
font-weight: bold;
}

main {
margin: 3% 20%;
}

a, .highlight {
color: #cceeff;
}

section h2 {
border-bottom: 5px solid #212121;
margin-bottom: 10px;
}
section ul {
list-style-position: inside;
}

@media (max-width: 480px) {
html {
font-size: 1.1rem;
}
main {
margin: 10% 10%;
}
nav {
display: none;
}
header {
font-size: 1.3rem;
height: 25%;
}
}
@media (min-width: 760px) and (max-width: 2000px) {
html {
font-size: 1.5rem;
}
main {
margin: 4% 15%;
}
}/*# sourceMappingURL=general.css.map */
Loading

0 comments on commit e9c930a

Please sign in to comment.