Merge branch 'new'.

1 files changed, 26 insertions, 28 deletions

diff --git a/main.css b/main.css
index df3a869..9c8fe2f 100644
--- a/main.css
+++ b/main.css
@@ -6,20 +6,16 @@ body {
 * {
 	margin: 0px;
 }
-h1 {
-	font-size: 24pt;
-	margin: 16px 0px 16px 0px;
-}
-h2 {
+body>section>h1 {
 	font-size: 20pt;
 	margin: 16px 0px 16px 0px;
 }
-h3 {
+body>section>article>h1 {
 	font-size: 16pt;
 	margin: 16px 0px 16px 0px;
 }
-h4 {
-	font-size: 12pt;
+body>section>article>h2 {
+	font-size: 14pt;
 	margin: 16px 0px 16px 0px;
 }
 p {
@@ -43,92 +39,94 @@ p span.super {
 	font-size: 9pt;
 }
 
-div.header {
-	margin: 16px;
-}
-div.header a.skip {
+a.skip {
 	display: none;
 }
-div.header h1 {
+
+header {
+	margin: 16px;
+}
+header>h1 {
+	font-size: 24pt;
 	font-family: serif;
 	margin: 0px 0px 0px 0px;
 }
-div.header h1 a {
+header>h1>a, header>h1>a:visited, header>h1>a:hover {
 	color: #000000;
 	text-decoration: none;
 }
-div.header h1 span.super {
+header>h1>a>span.super {
 	vertical-align: 33%;
 	font-size: 18pt;
 }
-div.header p {
+header>p {
 	font-style: italic;
 	text-align: right;
 	font-size: 12pt;
 	margin: 0px 0px 0px 0px;
 }
 
-div.menu {
+nav {
 	margin: 0px 0px 0px 0px;
 	padding: 0px 72px 0px 72px;
 	background-color: #CC4433;
 	text-align: center;
 }
-div.menu ul {
+nav>ul {
 	list-style-type: none;
 	margin: 0px;
 	padding: 12px 0px 12px 0px;
 }
-div.menu ul li {
+nav>ul>li {
 	display: inline;
 	font-family: sans-serif;
 	font-size: 12pt;
 }
-div.menu ul li a {
+nav>ul>li>a, nav>ul>li>a:visited {
 	color: #FFFFFF;
 	font-weight: bold;
 	font-size: 12pt;
 	text-decoration: none;
 	padding: 12px;
 }
-div.menu ul li a:hover {
+nav>ul>li>a:hover {
 	color: #FFFFAA;
 	background-color: #BB3311;
 	font-weight: bold;
 	text-decoration: none;
 }
 
-div.body {
+body>section {
 	margin: 24px 64px 8px 64px;
 	font-family: serif;
 }
 
-div.footer {
+footer {
 	margin: 32px 8px 8px 8px;
 	padding-top: 8px;
 	font-family: sans-serif;
 	border-top: 1px solid #666666;
 }
-div.footer p.copyright {
+footer p.copyright {
 	margin-top: 0px;
 }
-div.footer p.dates {
+footer p.dates {
 	margin-bottom: 0px;
 }
-div.footer p.web-site {
+footer p.web-site {
 	float: right;
 	margin-top: 0px;
 	margin-bottom: 0px;
 	text-align: right;
 }
-div.footer p.license img {
+footer p.license img {
 	float: left;
 	/*vertical-align: middle;*/
 	margin: 0px 8px 8px 0px;
 }
 
 /* Homepage */
-div.body img.photo {
+body>section img.photo {
 	float: right;
 	margin: 0px 0px 16px 16px;
 	width: 240px;