summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Yu <andrew@andrewyu.org>2022-07-26 02:56:47 +0800
committerAndrew Yu <andrew@andrewyu.org>2022-07-26 02:56:47 +0800
commit158eacd90dcefe46c7afb459aa96d3046fa9285d (patch)
treef2b58e0a95d1d9978e2906e5721f4a5c88f0a5d5
parenta611dcd00ab349a59d18790ce448677a9d329131 (diff)
downloadwww-158eacd90dcefe46c7afb459aa96d3046fa9285d.tar.gz
cleanup
-rw-r--r--article/template.html3
-rw-r--r--index.html111
2 files changed, 45 insertions, 69 deletions
diff --git a/article/template.html b/article/template.html
index 74510b7..f7146d5 100644
--- a/article/template.html
+++ b/article/template.html
@@ -7,9 +7,6 @@
 	</head>
 	<body>
 		<h1><++></h1>
-		<div id="main">
-			<++>
-		</div>
 		<div id="footer">
 			<hr />
 			<p><a href="/">Andrew Yu's Website</a></p>
diff --git a/index.html b/index.html
index 8ea53b3..000b736 100644
--- a/index.html
+++ b/index.html
@@ -7,72 +7,51 @@
 	</head>
 	<body>
 		<h1>Andrew Yu</h1>
-		<hr />
-		<div id="main">
-			<div id="nav">
-				<h2>Navigation</h2>
-				<ul>
-					<li><a href="https://www.andrewyu.org">Personal site (this page)</a></li>
-					<li><a href="#articles">My articles</a></li>
-					<li><a href="https://git.andrewyu.org" class="alert">Git repositories</a></li>
-					<li><a href="https://fcm.andrewyu.org" class="alert">Free Computing Movement</a></li>
-					<li><a href="https://learn.tuxiversity.org" class="alert">The Tuxiversity Project</a></li>
-					<li><a href="https://host.andrewyu.org" class="alert">Server guides</a></li>
-					<li><a href="https://users.andrewyu.org">Other users</a></li>
-				</ul>
-			</div>
-			<hr />
-			<div id="me">
-				<h2>About me</h2>
-				<p>I am Andrew Yu, a 14-year-old in Shanghai, China, currently studying at <a href="https://ykpaoschool.cn/">YK Pao School</a> (link requires JavaScript to function, will discuss replacements).  My main fields of interest are philosophy (especially political philosophy), metamathematics, programming fundamentals and molecular biology.  I'm also a Free Computing activist.</p>
-			</div>
-			<hr />
-			<div id="contact">
-				<h2>Contact</h2>
-				<p>There are many ways to contact me.  None of these require proprietary software.</p>
-				<ul>
-					<li>Talk to me in real life.</li>
-					<li>Paper mail.  (I cannot provide my home address to the general public.)</li>
-					<li>Electronic mail to <a href="mailto:andrew@andrewyu.org">andrew@andrewyu.org</a>.</li>
-					<li>Internet Relay Chat: ``Andrew'' on <a href="https://libera.chat/">Libera Chat</a> and <a href="https://irc.andrewyu.org/">LibreIRC</a>.</li>
-				</ul>
-				<p>Do not contact me via WeChat.  I only keep an account for school and use Mojo-Weixin to relay it to IRC.</p>
-			</div>
-			<hr />
-			<div id="pgp">
-				<h2>OpenPGP</h2>
-				<p>Usually, electronic mail that I send are signed with my OpenPGP key.  Please use OpenPGP when contacting me through electronic mail.  The following are available.</p>
-				<ul>
-					<li><a href="https://www.andrewyu.org/andrew-ecc.asc">My ECC key</a> is recommended.</li>
-					<li><a href="https://www.andrewyu.org/andrew.asc">My RSA key</a> is a fallback.</li>
-					<li><a href="https://www.andrewyu.org/allkeys.asc">My keyring for friends</a>.</li>
-				</ul>
-				<p>In order to verify the authenticity of the key, check if you've actually downloaded these keys from <code>andrewyu.org</code>, and also check the fingerprints with me elsewhere (email, IRC, in real life, etc) before trusting or signing it.</p>
-				<p>Once confirmed, please sign and share my key in order to build the OpenPGP Web of Trust.</p>
-			</div>
-			<hr />
-			<div id="articles">
-				<h2>Articles</h2>
-				<p>Pages for other projects are not listed&mdash;only independent articles are listed here.  These are sorted from newest to oldest.</p>
-				<ul>
-					<li><a href="/article/abortion.html">Abortion</a></li>
-					<li><a href="/article/pragmatic-use-of-nonfree-software.html">Pragmatic Use of Nonfree Software</a></li>
-					<li><a href="/article/free-software-education-in-china-and-covid-19.html">Free Software, Education in China and COVID-19</a></li>
-				</ul>
-				<p>I'm still adding them back here, might take a while for me to find my articles.  If you have any that I missed, please inform me.  Thanks.</p>
-			</div>
-			<hr />
-			<div id="randlinks">
-				<h2>Random links</h2>
-				<ul>
-					<li><a href="https://fsf.org">The Free Software Foundation</a>;</li>
-					<li><a href="https://based.cooking">A simple clean receipe site</a>;</li>
-					<li><a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">Surveillance vs democracy</a>;</li>
-					<li><a href="https://www.theguardian.com/commentisfree/2022/jan/19/america-biden-trump-authoritarinism">America's authoritarinism</a>.</li>
-				</ul>
-			</div>
-		</div>
-		<hr />
+		<h2 id="nav">Navigation</h2>
+		<ul>
+			<li><a href="https://www.andrewyu.org">Personal site (this page)</a></li>
+			<li><a href="#articles">Articles</a></li>
+			<li><a href="https://git.andrewyu.org">Git repositories</a></li>
+			<li><a href="https://fcm.andrewyu.org">Free Computing Movement</a></li>
+			<li><a href="https://learn.tuxiversity.org">The Tuxiversity Project</a></li>
+			<li><a href="https://host.andrewyu.org">Server guides (WIP)</a></li>
+			<li><a href="https://users.andrewyu.org">Other users</a></li>
+		</ul>
+		<h2 id="me">About me</h2>
+		<p>I am Andrew Yu, a 14-year-old in Shanghai, China, currently studying at <a href="https://ykpaoschool.cn/">YK Pao School</a> (link requires JavaScript to function, will discuss replacements).  My main fields of interest are philosophy (especially political philosophy), metamathematics, programming fundamentals and molecular biology.  I'm also a Free Computing activist.</p>
+		<h2 id="contact">Contact</h2>
+		<p>There are many ways to contact me.  None of these require proprietary software.</p>
+		<ul>
+			<li>Talk to me in real life.</li>
+			<li>Paper mail.  (I cannot provide my home address to the general public.)</li>
+			<li>Electronic mail to <a href="mailto:andrew@andrewyu.org">andrew@andrewyu.org</a>.</li>
+			<li>Internet Relay Chat: ``Andrew'' on <a href="https://libera.chat/">Libera Chat</a> and <a href="https://irc.andrewyu.org/">LibreIRC</a>.</li>
+		</ul>
+		<p>Do not contact me via WeChat.  I only keep an account for school and use Mojo-Weixin to relay it to IRC.</p>
+		<h3 id="pgp">OpenPGP</h2>
+		<p>Usually, electronic mail that I send are signed with my OpenPGP key.  Please use OpenPGP when contacting me through electronic mail.  The following are available.</p>
+		<ul>
+			<li><a href="https://www.andrewyu.org/andrew-ecc.asc">My ECC key</a> is recommended.</li>
+			<li><a href="https://www.andrewyu.org/andrew.asc">My RSA key</a> is a fallback.</li>
+			<li><a href="https://www.andrewyu.org/allkeys.asc">My keyring for friends</a>.</li>
+		</ul>
+		<p>In order to verify the authenticity of the key, check if you've actually downloaded these keys from <code>andrewyu.org</code>, and also check the fingerprints with me elsewhere (email, IRC, in real life, etc) before trusting or signing it.</p>
+		<p>Once confirmed, please sign and share my key in order to build the OpenPGP Web of Trust.</p>
+		<h2 id="articles">Articles</h2>
+		<p>Pages for other projects are not listed&mdash;only independent articles are listed here.  These are sorted from newest to oldest.</p>
+		<ul>
+			<li><a href="/article/abortion.html">Abortion</a></li>
+			<li><a href="/article/pragmatic-use-of-nonfree-software.html">Pragmatic Use of Nonfree Software</a></li>
+			<li><a href="/article/free-software-education-in-china-and-covid-19.html">Free Software, Education in China and COVID-19</a></li>
+		</ul>
+		<p>I'm still adding them back here, might take a while for me to find my articles.  If you have any that I missed, please inform me.  Thanks.</p>
+		<h2 id="random">Random links</h2>
+		<ul>
+			<li><a href="https://fsf.org">The Free Software Foundation</a>;</li>
+			<li><a href="https://based.cooking">A simple clean receipe site</a>;</li>
+			<li><a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">Surveillance vs democracy</a>;</li>
+			<li><a href="https://www.theguardian.com/commentisfree/2022/jan/19/america-biden-trump-authoritarinism">America's authoritarinism</a>.</li>
+		</ul>
 		<div id="footer">
 			<p>Works hosted on this subdomain (<code>www.andrewyu.org</code>) served with the HTTP(S) protocol is in the public domain.  (In juristictions where it is impossible to publish into the public domain, the following applies: Permission is hereby granted, free of charge, to any person obtaining a copy of this work, to deal in the work without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of this work, and to permit persons to whom the work is furnished to do so, with or without attribution.)</p>
 		</div>