about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--links/hero.css28
-rw-r--r--links/main.css113
-rw-r--r--src/inc/meta.nav.htm32
-rw-r--r--src/inc/nikko.htm7
-rw-r--r--src/main.zig5
5 files changed, 58 insertions, 127 deletions
diff --git a/links/hero.css b/links/hero.css
index 45f3127..bd66c25 100644
--- a/links/hero.css
+++ b/links/hero.css
@@ -20,22 +20,17 @@ main.hero>img {
   max-width: 66vw;
 }
 
-main.hero>nav li+li {
-  margin-top: 5px;
-}
-
-main.hero>nav section+section {
-  margin-top: 15px;
-}
-
 main.hero>nav {
-  float: none;
   width: calc(700px / 2);
 }
 
-main.hero>nav ul {
-  padding-left: 0;
-  margin: 0;
+main.hero>nav section {
+  display: block;
+  margin-left: 1rem;
+}
+
+main.hero>nav section+section {
+  margin-top: 15px;
 }
 
 main.hero>nav section.left {
@@ -53,3 +48,12 @@ main.hero>nav section.right {
   padding-left: 15px;
   border-left: 1px solid var(--fg);
 }
+
+main.hero>nav ul {
+  padding-left: 0;
+  margin: 0;
+}
+
+main.hero>nav li+li {
+  margin-top: 5px;
+}
diff --git a/links/main.css b/links/main.css
index 126a106..06dd322 100644
--- a/links/main.css
+++ b/links/main.css
@@ -33,71 +33,41 @@ body>*+* {
   margin-top: var(--body-spacing);
 }
 
+header {
+  float: left;
+  margin: 0 var(--body-spacing) 0 0;
+}
+
 header a {
   text-decoration: none;
 }
 
 header a img {
+  max-height: 55px;
   vertical-align: bottom;
 }
 
-header h1 {
-  --gap: 10px;
-
-  display: inline-block;
-  margin: 0;
-  padding: 5px;
-
-  border-left: 2px solid var(--fg);
-  margin-left: var(--gap);
-
-  font-weight: 800;
-}
-
-header h1::before {
-  content: "";
-  margin-left: var(--gap);
-}
-
-nav {
-  padding: 0 25px;
-  padding-top: 0;
-  float: right;
-}
-
-nav details summary {
-  margin-bottom: 25px;
+header+nav {
+  margin-top: 0;
 }
 
-nav .site-nav section {
+nav section {
+  display: inline-block;
   line-height: var(--body-line-height);
-  margin-bottom: 40px;
-
-  border-left: 1px solid var(--fg);
-  padding-left: 15px;
-  margin-left: -15px;
-}
-
-nav .site-nav section:first-child {
-  border-width: 2px;
-}
-
-nav .site-nav h1,
-nav .site-nav h2,
-nav .site-nav h3 {
-  margin: 0 0 1rem 0;
+  vertical-align: top;
 }
 
-nav .site-nav h4 {
-  margin: 0 0 0.3rem 0;
+nav section+* {
+  margin-left: 1rem;
 }
 
-nav .site-nav ul {
+nav ul {
   margin: 0px;
   padding: 0px;
 }
 
 main {
+  clear: both;
   max-width: 700px;
 }
 
@@ -406,7 +376,7 @@ main span.date {
   text-align: end;
 }
 
-main>section.table-of-contents {
+main>nav.table-of-contents {
   /*max-width: 30ch;*/
 
   position: sticky;
@@ -416,11 +386,7 @@ main>section.table-of-contents {
   margin-right: -22ch;
 }
 
-main>section.table-of-contents>nav {
-  float: unset;
-}
-
-main>section.table-of-contents>nav>ol>:first-child {
+main>nav.table-of-contents>ol>:first-child {
   text-transform: none;
   line-height: 2.0;
 }
@@ -523,52 +489,15 @@ ul.nobull li {
   ol a {
     line-height: 1.8;
   }
-
-  nav {
-    float: none;
-  }
-
-  nav .site-nav section {
-    display: inline-block;
-    margin: 0 10px 10px 0;
-  }
 }
 
-@media (max-width: 1100px) and (min-width: 651px) {
-  nav .site-nav section {
-    width: calc(25% - 10px);
-  }
+@media (max-width: 1100px) and (min-width: 651px) {}
 
-  nav .site-nav section:nth-child(4n + 1) {
-    clear: left;
-  }
-}
+@media (max-width: 650px) and (min-width: 501px) {}
 
-@media (max-width: 650px) and (min-width: 501px) {
-  nav .site-nav section {
-    width: calc(33% - 10px);
-  }
+@media (max-width: 500px) and (min-width: 351px) {}
 
-  nav .site-nav section:nth-child(3n + 1) {
-    clear: left;
-  }
-}
-
-@media (max-width: 500px) and (min-width: 351px) {
-  nav .site-nav section {
-    width: calc(50% - 10px);
-  }
-
-  nav .site-nav section:nth-child(2n + 1) {
-    clear: left;
-  }
-}
-
-@media (max-width: 350px) {
-  nav .site-nav section {
-    width: 100%;
-  }
-}
+@media (max-width: 350px) {}
 
 /* typography */
 
diff --git a/src/inc/meta.nav.htm b/src/inc/meta.nav.htm
index 8b19dda..0f0d4ff 100644
--- a/src/inc/meta.nav.htm
+++ b/src/inc/meta.nav.htm
@@ -1,17 +1,15 @@
-<details open>
-    <summary>menu</summary>
-    <section class="site-nav">
-        <section>
-            <ul class="nobull capital">
-                <li>{about}</li>
-                <li>{japan}</li>
-            </ul>
-        </section>
-        <section>
-            <h4>meta</h4>
-            <ul class="nobull capital">
-                <li>{index}</li>
-            </ul>
-        </section>
-    </section>
-</details>
+<section>
+    <ul class="nobull capital">
+        <li>{about}</li>
+    </ul>
+</section>
+<section>
+    <ul class="nobull capital">
+        <li>{japan}</li>
+    </ul>
+</section>
+<section>
+    <ul class="nobull capital">
+        <li>{index}</li>
+    </ul>
+</section>
diff --git a/src/inc/nikko.htm b/src/inc/nikko.htm
index 0f0034e..22300fe 100644
--- a/src/inc/nikko.htm
+++ b/src/inc/nikko.htm
@@ -1,14 +1,15 @@
 <!-- Generated file, you may edit and discard src/inc/nikko.md :) -->
-<section class="table-of-contents">
-<nav class="capital">
+<nav class="table-of-contents capital">
 <ol>
 <a href="#top">back to top</a>
 <li>
 <a href="#exploring-nikkō" id="toc-exploring-nikkō">exploring nikkō</a>
 </li>
+<li>
+<a href="#hotel" id="toc-hotel">hotel</a>
+</li>
 </ol>
 </nav>
-</section>
 <span class="date">
 2023-04-30 (2 days)
 </span>
diff --git a/src/main.zig b/src/main.zig
index 0ec2a43..f2c7b1b 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -174,10 +174,9 @@ fn build(allocator: std.mem.Allocator, f: std.fs.File, page_name: []const u8, sr
         \\<title>{[SITE_NAME]s} &mdash; {[PAGE_NAME]s}</title>
         \\</head>
         \\<body>
+        \\
         \\<header>
-        \\<a href="/"><img src="../media/interface/logo.svg" alt="{[SITE_NAME]s}" height="50">
-        // \\<h1>gzr.im</h1>
-        \\</a>
+        \\<a href="/"><img src="../media/interface/logo.svg" alt="{[SITE_NAME]s}"></a>
         \\</header>
         \\
     , .{