commit a7a81618432c3402c61712a7cf19352b4ba3c010
parent 692fdc5391245ba867060d49d4b6cba0fbbb3baf
Author: knutsen <samuel@knutsen.co>
Date: Sat, 8 May 2021 22:18:11 +0100
Add mascots to favicon, add contact info, remove unwanted styling.
Diffstat:
24 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/background-300x300.png b/background-300x300.png
Binary files differ.
diff --git a/books.html b/books.html
@@ -4,6 +4,7 @@
<head>
<title>Shimo!!</title>
<link rel='stylesheet' type='text/css' href="style.css"/>
+ <link rel='icon' type='image/png' href="mascots/1.png">
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
@@ -28,4 +29,4 @@
<img src="mascots/1.png" id="mascot"></img>
<script src="image.js"></script>
</body>
-</html>-
\ No newline at end of file
+</html>
diff --git a/crop-mascots.sh b/crop-mascots.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+shopt -s extglob
+
+for file in mascots/+([0-9]).png; do
+ echo "$file -> ${file:0:-4}-square.png"
+ convert "$file" -gravity Northwest -crop 1:1 "${file:0:-4}-square.png"
+done
+
+echo -e "\nDone."
diff --git a/image.js b/image.js
@@ -1,7 +1,12 @@
const mascot = document.getElementById("mascot");
-const randomYui = () =>
- mascot.setAttribute("src", "/mascots/" + Math.floor(1 + Math.random()*14) + ".png");
+const favicon = document.querySelector("link[rel~='icon']");
+
+const randomYui = () => {
+ const stem = "mascots/" + Math.floor(1 + Math.random()*14);
+ mascot.setAttribute("src", stem + ".png");
+ favicon.setAttribute("href", stem + "-square.png");
+}
randomYui();
-mascot.addEventListener("click", randomYui)-
\ No newline at end of file
+mascot.addEventListener("click", randomYui)
diff --git a/index.html b/index.html
@@ -3,14 +3,15 @@
<head>
<title>Shimo!!</title>
- <link rel='stylesheet' type='text/css' href="style.css"/>
+ <link rel='stylesheet' type='text/css' href="style.css">
+ <link rel='icon' type='image/png' href="mascots/1.png">
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<div id="content">
- <h1>Shimo!!</h1>
+ <a href="/"><h1>Shimo!!</h1></a>
<div class="titleBar">
<div class="titleButton"><a href="/music">Musik</a></div>
@@ -19,21 +20,26 @@
<div class="titleButton"><a href="/books">Bøker</a></div>
</div>
- <p>Hei, jeg heter Shimo, jeg studerer fysikk og kjemi på universitet.
+ <p>Hei, jeg heter Shimo, jeg studerer fysikk og kjemi på universitet.
Jeg liker å lese (favoritten min er Kafka) og spile gitar.
Waifuen min er Yui, selvfølgelig.
</p>
+ <p>
+ Kontakt: <a href="mailto:sam@shii.moe"><code>sam@shii.moe</code></a>,
+ <a href="https://twitter.com/shimofruit"><code>@shimofruit</code></a>.
+ </p>
+
<h2>Sign the <a class="titleButton" style="width:auto; margin: 0;" href="/guestbook">Guestbook!!</a></h2>
- <h3>Reasons why women should sleep with me</h3>
+ <h3>Reasons Why Women Should Sleep With Me:</h3>
<ol>
<li>I'm 6'</li>
<li>I have a blåhaj</li>
<li>My Mum says I'm cool</li>
<li>I'll give you kisses</li>
- <li>I have a PGP key: <a href="shiimoe.rsa"><code>A5E16A6FFC9DD158</code></a></li>
- <li>My website is <a href="https://git.knutsen.co/shii.moe">open source!</a></li>
+ <li>I have a PGP key: <a href="shiimoe.rsa"><code>A5E16A6FFC9DD158</code></a></li>
+ <li>My website is <a href="https://git.knutsen.co/shii.moe">open source!</a></li>
</ol>
</div>
diff --git a/mascots/1-square.png b/mascots/1-square.png
Binary files differ.
diff --git a/mascots/10-square.png b/mascots/10-square.png
Binary files differ.
diff --git a/mascots/11-square.png b/mascots/11-square.png
Binary files differ.
diff --git a/mascots/12-square.png b/mascots/12-square.png
Binary files differ.
diff --git a/mascots/13-square.png b/mascots/13-square.png
Binary files differ.
diff --git a/mascots/14-square.png b/mascots/14-square.png
Binary files differ.
diff --git a/mascots/2-square.png b/mascots/2-square.png
Binary files differ.
diff --git a/mascots/3-square.png b/mascots/3-square.png
Binary files differ.
diff --git a/mascots/4-square.png b/mascots/4-square.png
Binary files differ.
diff --git a/mascots/5-square.png b/mascots/5-square.png
Binary files differ.
diff --git a/mascots/6-square.png b/mascots/6-square.png
Binary files differ.
diff --git a/mascots/7-square.png b/mascots/7-square.png
Binary files differ.
diff --git a/mascots/7_1.png b/mascots/7_1.png
Binary files differ.
diff --git a/mascots/8-square.png b/mascots/8-square.png
Binary files differ.
diff --git a/mascots/9-square.png b/mascots/9-square.png
Binary files differ.
diff --git a/music.html b/music.html
@@ -4,6 +4,7 @@
<head>
<title>Musik!!</title>
<link rel='stylesheet' type='text/css' href="style.css"/>
+ <link rel='icon' type='image/png' href="mascots/1.png">
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
@@ -23,11 +24,11 @@
<source src="lemon.mp3" type="audio/mpeg">
</audio>
</div>
-
+
<div class = "guitarCentre">
<img src="gita.jpg" class="guitarPicture">
- <p class="guitarText">A recording of <em>Lemon Meringue Tie</em> by <em>Dance Gavin Dance</em> played on my <em>Epiphone Les Paul</em>, coming
+ <p class="guitarText">A recording of <em>Lemon Meringue Tie</em> by <em>Dance Gavin Dance</em> played on my <em>Epiphone Les Paul</em>, coming
through an <em>Orange Crush 20</em> with a <em>Boss DS-1</em> for distortion.
</p>
<p class="guitarText">Et opptak av <em>Lemon Merginue Tie</em> av <em>Dance Gavin Dance</em> spillet
@@ -53,4 +54,4 @@
<img src="mascots/1.png" id="mascot"></img>
<script src="image.js"></script>
</body>
-</html>-
\ No newline at end of file
+</html>
diff --git a/norsk.html b/norsk.html
@@ -4,6 +4,7 @@
<head>
<title>Shimo!!</title>
<link rel='stylesheet' type='text/css' href="style.css"/>
+ <link rel='icon' type='image/png' href="mascots/1.png">
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
@@ -30,4 +31,4 @@
<script src="image.js"></script>
</body>
-</html>-
\ No newline at end of file
+</html>
diff --git a/school.html b/school.html
@@ -4,6 +4,7 @@
<head>
<title>Shimo!!</title>
<link rel='stylesheet' type='text/css' href="style.css"/>
+ <link rel='icon' type='image/png' href="mascots/1.png">
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
@@ -28,4 +29,4 @@
<img src="mascots/1.png" id="mascot"></img>
<script src="image.js"></script>
</body>
-</html>-
\ No newline at end of file
+</html>
diff --git a/style.css b/style.css
@@ -18,8 +18,8 @@ html, body {
body {
color: black;
- background: black;
- background-image: url('background.png');
+ background: #baddff;
+ background-image: url('background-300x300.png');
background-size: 10em;
background-repeat: repeat;
font-family: 'Lora', serif;
@@ -57,6 +57,10 @@ pre code {
display: block;
}
+#content > a:first-child {
+ text-decoration: none;
+}
+
.titleBar {
background-color: #679dd74d;
border-radius: 5pt;
